 钱涛
|
2bd092ae11
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-07-11 17:19:10 +08:00 |
|
钱涛
|
aa864cdd38
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-07-11 17:18:47 +08:00 |
|
钱涛
|
ed5f6da8a6
|
缴款需要按照分类分别缴纳
|
2025-07-11 17:18:15 +08:00 |
Harryxzy
|
fb239f34ed
|
修复薪资核算筛选为空时导出报错
|
2025-07-09 10:08:27 +08:00 |
|
钱涛
|
aa5547025f
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-07-08 18:28:24 +08:00 |
|
钱涛
|
b82538fea9
|
申报免税收入
|
2025-07-08 18:28:00 +08:00 |
|
钱涛
|
d3e40d1b9e
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-07-07 10:21:36 +08:00 |
|
Harryxzy
|
be3b4fc7e1
|
个税版本 个税申报bug修复
|
2025-07-04 15:13:28 +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 |
|
钱涛
|
cabaed627b
|
其他附加扣除增加申报类型
|
2025-07-02 13:42:41 +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
|
2cd9484069
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-19 17:28:50 +08:00 |
|
Harryxzy
|
bfd953d082
|
水印单独配置分部不显示
|
2025-06-19 17:28:09 +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
|
e402029f6c
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-06-19 11:38:40 +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 |
|
钱涛
|
ef1bfbdc25
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-18 17:22:14 +08:00 |
|
钱涛
|
c7e295e1d2
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-06-18 17:21:51 +08:00 |
|
钱涛
|
d4e6e111fc
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-18 17:21:35 +08:00 |
|
钱涛
|
f7cba636b3
|
修复默认值保留位数
|
2025-06-18 17:21:22 +08:00 |
|
钱涛
|
5f3c5f82b8
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-18 13:33:24 +08:00 |
|
钱涛
|
c27105aa21
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-06-18 13:33:02 +08:00 |
|
钱涛
|
a8c6e8e59e
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-18 13:32:41 +08:00 |
|
钱涛
|
919ade5715
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-06-18 13:32:17 +08:00 |
|
钱涛
|
de5caded9e
|
修复工资单性别问题
|
2025-06-18 13:32:12 +08:00 |
|
钱涛
|
c3d6ac8b66
|
分类所得-上市公司股息红利所得(沪市、深市、创业板)
分类所得-其他利息股息红利所得
|
2025-06-17 17:25:27 +08:00 |
|
钱涛
|
d4ff9af8b7
|
分类所得-上市公司股息红利所得(沪市、深市、创业板)
分类所得-其他利息股息红利所得
|
2025-06-17 11:23:30 +08:00 |
|
Harryxzy
|
1263514a81
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-16 18:06:40 +08:00 |
|
Harryxzy
|
c2f2390013
|
修复薪资明细导出，合计行统计文本字段
|
2025-06-16 16:41:38 +08:00 |
|
Harryxzy
|
447d682b4e
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-06-13 09:32:11 +08:00 |
|
钱涛
|
3dc9f327df
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-12 11:04:58 +08:00 |
|
Harryxzy
|
2c39a1fa12
|
toMap空指针bug
|
2025-06-12 10:25:31 +08:00 |
|
Harryxzy
|
84339ab715
|
定时任务查询超1000bug
|
2025-06-10 17:35:44 +08:00 |
|
钱涛
|
d35b6df42b
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-06-10 10:54:19 +08:00 |
|
钱涛
|
2cc43b8983
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-10 10:54:11 +08:00 |
|
钱涛
|
adbdb64b4c
|
补偿金自动生成免税附表
|
2025-06-06 11:07:33 +08:00 |
|
钱涛
|
9af6178636
|
对“是否雇员”字段为“其他”时的场景做了调整。新增了一个字段 ”其他情况说明“
|
2025-06-06 10:27:16 +08:00 |
|
Harryxzy
|
af64d39fa7
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-29 10:56:23 +08:00 |
|
Harryxzy
|
aff5dbf185
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-05-29 10:39:32 +08:00 |
|
Harryxzy
|
578842aa39
|
修复数据穿透过滤条件
|
2025-05-29 10:39:06 +08:00 |
|
钱涛
|
61153309ca
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-27 15:57:28 +08:00 |
|
钱涛
|
1026ff1aae
|
fix邮件中数据为null
|
2025-05-27 15:56:33 +08:00 |