sy
|
f68981baac
|
薪酬系统-福利台账，福利核算、核算明细列表逻辑优化（取消对档案状态的过滤）
|
2023-04-17 10:27:31 +08:00 |
Harryxzy
|
b5d3acf418
|
Merge branch 'feature/salaryItemFieldsCanCopy_0420' into release/2.7.3.2304.01
|
2023-04-14 09:04:23 +08:00 |
 钱涛
|
59a38954bc
|
Merge branch 'feature/个人养老金' into release/2.7.3.2304.01
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
|
2023-04-13 09:35:29 +08:00 |
|
钱涛
|
a4a829d201
|
年终奖数据
|
2023-04-11 17:24:31 +08:00 |
|
Harryxzy
|
e21b53c2df
|
Merge branch 'fix/deleteSalarySobAddCheck_0414' into release/2.7.3.2304.01
|
2023-04-11 14:00:26 +08:00 |
|
Harryxzy
|
bbe7edaa22
|
Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01
|
2023-04-11 13:56:18 +08:00 |
|
Harryxzy
|
0bfe0b62a7
|
fix 字段重复无法保存
|
2023-04-11 11:43:32 +08:00 |
|
Harryxzy
|
8c58cf01b3
|
字段拷贝调整
|
2023-04-11 10:48:41 +08:00 |
|
Harryxzy
|
a286ac6f44
|
Merge branch 'fix/salaryArchiveImportByRuleBug_0407' into release/2.7.3.2304.01
|
2023-04-11 10:18:54 +08:00 |
|
Harryxzy
|
0ef8a2ae12
|
Merge branch 'fix/salaryItemHideDuplicateItem_0407' into release/2.7.3.2304.01
|
2023-04-11 10:16:28 +08:00 |
|
Harryxzy
|
c3dfc5692e
|
薪资项目拷贝
|
2023-04-11 09:56:20 +08:00 |
|
Harryxzy
|
d9f041c9bb
|
账套删除前校验是否存在工资单模板
|
2023-04-07 16:06:47 +08:00 |
|
Harryxzy
|
207d338ec2
|
薪资账套重复薪资项目
|
2023-04-07 15:14:07 +08:00 |
|
钱涛
|
b0284022c1
|
核算导出全部功能修复
|
2023-04-07 14:39:22 +08:00 |
|
钱涛
|
bb76df3718
|
个人养老金
|
2023-04-04 17:29:56 +08:00 |
|
Harryxzy
|
accb0d3d2b
|
社保福利台账 - 合计列
|
2023-04-04 17:21:29 +08:00 |
|
钱涛
|
44fe9203ab
|
个人养老金
|
2023-04-04 14:21:25 +08:00 |
|
钱涛
|
cb46fccb16
|
工资单推送
|
2023-04-03 18:49:28 +08:00 |
|
sy
|
521db08cde
|
Merge remote-tracking branch 'remotes/origin/feature/v4-salaryExcelFormat-0328' into release/2.7.3.2304.01
# Conflicts:
# src/com/engine/salary/service/SalaryAcctExcelService.java
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
|
2023-04-03 15:59:58 +08:00 |
|
Harryxzy
|
dcfe6479ed
|
Merge branch 'feature/cancelSuspend' into release/2.7.3.2304.01
|
2023-04-03 11:12:20 +08:00 |
|
Harryxzy
|
4faa9e36a6
|
取消待办优化
|
2023-03-31 10:17:31 +08:00 |
|
Harryxzy
|
52decb10ff
|
Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01
|
2023-03-30 11:03:22 +08:00 |
|
Harryxzy
|
f0c80f3287
|
薪资档案导入无法带出工号数据
|
2023-03-30 10:02:09 +08:00 |
|
Harryxzy
|
2fc4560488
|
薪资档案按照工号导入无效
|
2023-03-29 16:46:10 +08:00 |
|
Harryxzy
|
b331152d27
|
修复合计列
|
2023-03-28 13:59:57 +08:00 |
|
Harryxzy
|
d99e6147d3
|
Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01
|
2023-03-28 13:40:12 +08:00 |
|
Harryxzy
|
952a8e845c
|
修复合计列
|
2023-03-28 11:00:18 +08:00 |
|
Harryxzy
|
2dc40a7b91
|
取消待办
|
2023-03-28 10:10:54 +08:00 |
|
Harryxzy
|
95cf271c80
|
修复薪资档案导入，重复数据报错行数少一
|
2023-03-28 09:31:00 +08:00 |
|
Harryxzy
|
530dcd7028
|
Merge branch 'feature/SalaryAcctResult-ImportField-cache_0324' into release/2.7.3.2304.01
|
2023-03-27 17:36:41 +08:00 |
|
钱涛
|
9f6950d8ae
|
工资单发放
|
2023-03-20 17:36:29 +08:00 |
|
Harryxzy
|
1ab7fcc7b8
|
Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.1.2303.02
|
2023-03-16 17:20:43 +08:00 |
|
Harryxzy
|
3304ffdbd5
|
薪资核算导入，添加表头字段缓存功能
|
2023-03-16 16:19:23 +08:00 |
|
Harryxzy
|
e1b4927eaa
|
删除多余代码
|
2023-03-16 14:52:08 +08:00 |
|
sy
|
dc2cb5f448
|
薪酬系统-薪资核算，薪资核算和薪资档案导出excel通用格式改造
|
2023-03-16 13:51:41 +08:00 |
|
Harryxzy
|
b9c40955ac
|
Merge branch 'fix/AddUpSituationCantImport_0316' into release/2.7.1.2303.02
|
2023-03-16 11:38:38 +08:00 |
|
Harryxzy
|
cdf7dd916b
|
往期累计情况编辑
|
2023-03-16 11:37:43 +08:00 |
|
Harryxzy
|
6a7e5eacdc
|
社保福利台账合计列
|
2023-03-16 11:17:18 +08:00 |
|
Harryxzy
|
521de26b51
|
Merge branch 'fix/AddUpSituationCantImport_0316' into release/2.7.1.2303.02
|
2023-03-16 09:54:49 +08:00 |
|
Harryxzy
|
16cfe18b90
|
往期累计情况导入BUG
|
2023-03-16 09:53:46 +08:00 |
|
Harryxzy
|
ca03e0785e
|
工资单发放详情导出没有部门信息
|
2023-03-15 17:09:02 +08:00 |
|
Harryxzy
|
712f30ddfa
|
工资单发放详情合计列
|
2023-03-15 16:00:37 +08:00 |
|
Harryxzy
|
a9fb24145d
|
修复往期累计情况，无法导入编辑
|
2023-03-15 14:14:53 +08:00 |
|
Harryxzy
|
6418e4ad6e
|
往期累计情况，获取当月税款所属期数据无法导入bug，
|
2023-03-15 13:38:13 +08:00 |
|
sy
|
3059829619
|
Merge remote-tracking branch 'remotes/origin/release/2.7.1.2303.02' into feature/v4-salaryExcelFormat-0328
|
2023-03-15 10:22:37 +08:00 |
|
sy
|
acc382b835
|
薪酬系统-薪资核算，核算导出excel格式改造
|
2023-03-15 10:20:46 +08:00 |
|
钱涛
|
5c75b3cf8e
|
去除无用代码
|
2023-03-14 14:22:45 +08:00 |
|
钱涛
|
b54d754c4b
|
删除个税扣缴义务人人员范围改异步
|
2023-03-14 11:04:25 +08:00 |
|
钱涛
|
2d091dbd33
|
异步同步人员校验
|
2023-03-10 17:15:15 +08:00 |
|
Harryxzy
|
7de5c1e175
|
Merge branch 'fix/V3_listShowChange_0309' into release/2.7.1.2303.02
|
2023-03-10 15:42:42 +08:00 |