Commit Graph

1604 Commits

Author SHA1 Message Date
钱涛 ac2046a8e7 新增、删除申报表 2023-12-29 17:24:52 +08:00
钱涛 bca7697d75 取消全年一次性奖金限制 2023-12-29 11:46:00 +08:00
钱涛 79ba7c754c 申报反馈 2023-12-28 20:59:13 +08:00
钱涛 8456692b29 Merge branch 'feature/个税2312版本功能' into feature/艾志-正常申报补足年终奖人员 2023-12-28 18:49:05 +08:00
钱涛 b1e1aeffd7 Merge branch 'release/个税版本' into feature/个税2312版本功能 2023-12-28 18:48:52 +08:00
钱涛 df16be5dd7 导入申报表 2023-12-28 18:45:52 +08:00
钱涛 463e56d2cf 导入申报表 2023-12-28 18:12:38 +08:00
Harryxzy 622bd9ceb8 人员信息报送导入 2023-12-28 16:44:01 +08:00
钱涛 4d84164d48 Merge branch 'feature/个税2312版本功能' into feature/艾志-正常申报补足年终奖人员 2023-12-28 15:49:50 +08:00
钱涛 e2b341b675 Merge branch 'release/个税版本' into feature/个税2312版本功能 2023-12-28 15:49:28 +08:00
钱涛 fefb8264c8 导入功能 2023-12-28 15:36:27 +08:00
钱涛 4e0a5b4b7f 下载内置算税明细 2023-12-28 14:09:34 +08:00
钱涛 0a16415d9a Merge branch 'feature/个税2312版本功能' into feature/艾志-正常申报补足年终奖人员 2023-12-28 10:11:55 +08:00
Harryxzy 0f4d92f302 人员信息报送身份中号转为大写 2023-12-28 10:10:08 +08:00
钱涛 8b78ccd43b Merge branch 'release/个税版本' into feature/个税2312版本功能 2023-12-28 09:51:34 +08:00
钱涛 7e561527ac 补充正常工资薪金的申报 2023-12-27 17:35:16 +08:00
钱涛 13f310e9e4 记录申报表数据来源 2023-12-27 17:33:53 +08:00
Harryxzy 2dc7e7f541 人员信息报送导入 2023-12-27 16:58:47 +08:00
Harryxzy 2797745448 人员信息报送-导入 2023-12-26 17:45:06 +08:00
钱涛 c581c8d74d 导出申报表明细 2023-12-20 17:21:46 +08:00
钱涛 d9c952e80c 申报表明细新增、编辑 2023-12-14 17:55:48 +08:00
钱涛 4810bfb73e Merge branch 'release/个税版本' into feature/个税2312版本功能 2023-12-14 10:42:15 +08:00
钱涛 0856f63ca5 Merge branch 'release/2.9.10.2312.02' into release/个税版本
# Conflicts:
#	src/com/engine/salary/util/page/SalaryPageUtil.java
2023-12-14 10:41:37 +08:00
钱涛 0a54fe5f80 新增申报 2023-12-14 10:35:10 +08:00
钱涛 a5ffe12509 身份证最后一位x转大写 2023-12-13 19:34:10 +08:00
钱涛 fa30083d07 人员报送导入模板 2023-12-13 17:52:51 +08:00
钱涛 f53922a3ab 去除作废接口限制 2023-12-12 17:18:56 +08:00
Harryxzy 51022c0a16 薪资核算结果、线下对比下载导入模板优化fix 2023-12-12 14:22:18 +08:00
Harryxzy 9602e48e74 薪资核算结果、线下对比下载导入模板优化fix 2023-12-12 14:11:48 +08:00
钱涛 4d573956c8 修复账套税款所属期初始化bug 2023-12-12 11:06:25 +08:00
Harryxzy 559ba88e9f 薪资核算结果、线下对比下载导入模板优化 2023-12-12 10:32:04 +08:00
Harryxzy 929bcc7877 薪资核算结果、线下对比下载导入模板优化 2023-12-12 10:18:10 +08:00
钱涛 82ec08bfd9 导出申报明细 2023-12-08 18:15:56 +08:00
钱涛 48f5d5ab0e 适配分部门企业注册 2023-12-07 15:48:06 +08:00
钱涛 009a3e3c74 人员报送导出
修复清除离职日期bug
2023-12-06 16:37:42 +08:00
钱涛 54d8f3ef39 修复人员信息无法置空问题 2023-12-05 17:17:11 +08:00
钱涛 1a061aa346 同步所有人员报送发薪日期为入职日期 2023-12-05 17:08:35 +08:00
钱涛 791bc2ffca Merge branch 'release/2.9.9.2312.01' into release/个税版本
# Conflicts:
#	src/com/engine/salary/service/SalaryArchiveService.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
2023-12-05 15:09:40 +08:00
钱涛 390251bd63 Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01 2023-12-05 15:08:44 +08:00
钱涛 dd48bff747 同步所有档案起始发薪日期为入职日期 2023-12-05 15:08:37 +08:00
钱涛 045873525c 个税云查询报税明细 2023-12-05 14:58:02 +08:00
Harryxzy 3687bdfcdc Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01 2023-12-05 11:30:04 +08:00
Harryxzy b093717e46 Merge branch 'fix/231102_账套增加义务人筛选' into release/2.9.9.2312.01 2023-12-05 11:28:47 +08:00
sy ce10204dab Merge remote-tracking branch 'remotes/origin/feature/231102-福利台账,补差待编辑项扩充其他可缴纳福利项' into release/2.9.9.2312.01 2023-12-05 11:26:48 +08:00
Harryxzy a0331112be Merge branch 'fie/231102_线下对比列头改造' into release/2.9.9.2312.01 2023-12-05 11:26:22 +08:00
sy 362c4d4459 薪酬系统-福利台账,正常缴纳和补缴中未设置缴纳的福利项导入校验优化,忽略为null的福利类缴纳map 2023-12-05 10:21:47 +08:00
sy cecbd16508 薪酬系统-福利台账,正常缴纳和补缴中未设置缴纳的福利项,不允许导入核算数据 2023-12-04 15:10:46 +08:00
钱涛 121da2f7ad 个税云参数调整 2023-12-01 11:46:21 +08:00
Harryxzy df25f99544 薪资核算固定列头 2023-11-29 16:48:09 +08:00
sy eaa8a45376 薪酬系统-福利台账,编辑功能带出福利项数据逻辑优化,增加缴纳对象(公司或个人)标志字段 2023-11-29 13:50:25 +08:00