Harryxzy
|
16d50d8c1a
|
Merge branch 'release/个税版本' into custom/联特
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
|
2025-07-04 15:24:11 +08:00 |
|
Harryxzy
|
be3b4fc7e1
|
个税版本 个税申报bug修复
|
2025-07-04 15:13:28 +08:00 |
|
Harryxzy
|
240cfb9f75
|
联特需求新增、调整
|
2025-07-04 10:43:58 +08:00 |
 钱涛
|
56e19ea9da
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# resource/WEB-INF/prop/hrmSalary.properties
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2025-07-02 20:45:41 +08:00 |
|
钱涛
|
d6061fa059
|
申报
|
2025-07-02 20:43:53 +08:00 |
|
钱涛
|
2a883868ba
|
Merge branch 'release/个税版本' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2025-07-02 20:08:08 +08:00 |
|
钱涛
|
a2303bb450
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-07-02 20:06:02 +08:00 |
|
钱涛
|
fe7481d753
|
核算精准使用附表
|
2025-07-02 20:02:05 +08:00 |
|
钱涛
|
b2507306e5
|
附表导入导出功能
|
2025-07-02 15:46:32 +08:00 |
|
钱涛
|
de713c820d
|
附表填写
|
2025-07-02 11:37:16 +08:00 |
|
钱涛
|
cb02136ff6
|
免税收入
|
2025-07-01 18:37:50 +08:00 |
|
Harryxzy
|
5cc0dda5f6
|
修复业务线版本个税申报bug
|
2025-06-27 13:45:57 +08:00 |
|
钱涛
|
53c8909de4
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-25 14:37:22 +08:00 |
|
Harryxzy
|
71a3ba4569
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-19 11:39:25 +08:00 |
|
Harryxzy
|
63c9558331
|
修复社保上下限校验 漏掉只开启了公司没开启个人的场景
|
2025-06-19 11:38:05 +08:00 |
|
钱涛
|
0b566561a0
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-06-19 11:05:09 +08:00 |
|
钱涛
|
c3d6ac8b66
|
分类所得-上市公司股息红利所得(沪市、深市、创业板)
分类所得-其他利息股息红利所得
|
2025-06-17 17:25:27 +08:00 |
|
钱涛
|
d4ff9af8b7
|
分类所得-上市公司股息红利所得(沪市、深市、创业板)
分类所得-其他利息股息红利所得
|
2025-06-17 11:23:30 +08:00 |
|
钱涛
|
3dc9f327df
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-12 11:04:58 +08:00 |
|
Harryxzy
|
84339ab715
|
定时任务查询超1000bug
|
2025-06-10 17:35:44 +08:00 |
|
钱涛
|
eb26e556a3
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# src/com/engine/salary/util/excel/ExcelUtilPlus.java
|
2025-06-10 10:55:00 +08:00 |
|
钱涛
|
a16a16d13a
|
Merge branch 'release/3.0.2.2504.01' into custom/联特
# Conflicts:
# src/com/engine/salary/util/excel/ExcelUtilPlus.java
|
2025-06-10 10:53:55 +08:00 |
|
Harryxzy
|
6b5aebb6dd
|
联特修复已推送状态
|
2025-06-10 10:39:13 +08:00 |
|
Harryxzy
|
5aefe5272d
|
联特 流程获取数据接口
|
2025-06-05 10:48:28 +08:00 |
|
钱涛
|
a5b693041f
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-05-21 11:37:40 +08:00 |
|
钱涛
|
c6633005aa
|
个税版本取消系统算税
|
2025-05-21 11:37:25 +08:00 |
|
钱涛
|
9c06f080c5
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/util/excel/ExcelUtilPlus.java
|
2025-05-20 16:47:54 +08:00 |
|
钱涛
|
445fce498a
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-05-20 16:20:31 +08:00 |
|
钱涛
|
9bb7c7f7f5
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-05-20 16:20:25 +08:00 |
|
Harryxzy
|
3b6a6222c9
|
Merge remote-tracking branch 'origin/custom/联特' into custom/联特
|
2025-05-16 11:14:14 +08:00 |
|
Harryxzy
|
a711c2f557
|
联特工资单发生校验修改
|
2025-05-16 11:13:46 +08:00 |
|
钱涛
|
f117f888b9
|
Merge branch 'release/个税版本' into custom/联特
|
2025-05-15 14:08:40 +08:00 |
|
钱涛
|
4a2821d793
|
离职日期允许导入清空
|
2025-05-15 14:08:12 +08:00 |
|
Harryxzy
|
e2839767fa
|
联特，cbs推送
|
2025-05-14 11:06:07 +08:00 |
|
Harryxzy
|
6cfeed52f6
|
联特修复
|
2025-05-13 15:57:00 +08:00 |
|
钱涛
|
a0f85ea367
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-13 13:14:54 +08:00 |
|
钱涛
|
7de3dca2a3
|
撤回的工资单不允许查看
|
2025-05-13 13:14:30 +08:00 |
|
Harryxzy
|
888472d5e0
|
联特cbs对接
|
2025-05-13 11:05:10 +08:00 |
|
Harryxzy
|
8e839b23ba
|
Merge remote-tracking branch 'origin/custom/联特' into custom/联特
|
2025-05-12 18:31:09 +08:00 |
|
Harryxzy
|
4c05906f03
|
联特cbs对接
|
2025-05-12 17:42:15 +08:00 |
|
钱涛
|
48712d7d37
|
打印人员报送反馈
|
2025-05-12 15:24:21 +08:00 |
|
钱涛
|
8f2ff5e63d
|
Merge branch 'release/个税&业务线' into custom/联特
|
2025-05-09 19:47:12 +08:00 |
|
钱涛
|
3e49c412ea
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-05-09 19:47:02 +08:00 |
|
钱涛
|
24e7cbb32e
|
处理申报人次
|
2025-05-09 19:46:32 +08:00 |
|
钱涛
|
df093e606c
|
二开，自离账套不参与申报
|
2025-05-09 17:59:40 +08:00 |
|
钱涛
|
223049c9c5
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
|
2025-05-09 16:31:23 +08:00 |
|
钱涛
|
603d31b095
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-05-09 16:28:56 +08:00 |
|
钱涛
|
f6428be044
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-05-09 16:23:53 +08:00 |
|
钱涛
|
3a843fc41f
|
Merge branch 'release/3.0.2.2504.01' into custom/联特
|
2025-05-09 16:23:21 +08:00 |
|
钱涛
|
6925e4daea
|
fix冲突
|
2025-05-09 16:21:17 +08:00 |