Harryxzy
|
f491daeea0
|
联特表5 - 生成人员明细工资计提表联特表6 - 生成人员明细工资实发表
|
2025-08-13 11:41:36 +08:00 |
|
Harryxzy
|
fd0808bb0c
|
联特 报表（4张）
|
2025-08-06 18:09:19 +08:00 |
|
Harryxzy
|
3a1d2defbe
|
联特 半年度、年度
|
2025-07-22 18:30:34 +08:00 |
|
Harryxzy
|
dd53bd861c
|
联特调整
|
2025-07-21 16:13:59 +08:00 |
|
Harryxzy
|
61af1d5c09
|
联特个税项目，默认只能从税局取，不合并计税
|
2025-07-17 17:18:37 +08:00 |
|
Harryxzy
|
8ca7a266ae
|
联特分段计算调整
|
2025-07-15 15:11:46 +08:00 |
|
Harryxzy
|
83d2cf2eb1
|
Merge remote-tracking branch 'origin/custom/联特' into custom/联特
|
2025-07-15 13:34:24 +08:00 |
|
Harryxzy
|
b617922bbf
|
sql优化
|
2025-07-15 13:34:04 +08:00 |
 钱涛
|
bd3ec879f3
|
Merge branch 'release/个税&业务线' into custom/联特
|
2025-07-11 17:19:32 +08:00 |
|
钱涛
|
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
|
2971217a28
|
Merge remote-tracking branch 'origin/custom/联特' into custom/联特
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
|
2025-07-09 13:59:42 +08:00 |
|
Harryxzy
|
fb239f34ed
|
修复薪资核算筛选为空时导出报错
|
2025-07-09 10:08:27 +08:00 |
|
钱涛
|
c258bbee2a
|
处理冲突
|
2025-07-08 18:36:48 +08:00 |
|
钱涛
|
ec2a057a3c
|
版本
|
2025-07-08 18:31:26 +08:00 |
|
钱涛
|
dd3fe4c821
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
|
2025-07-08 18:30:11 +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 |
|
钱涛
|
1dda34408f
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-07-07 10:21:54 +08:00 |
|
钱涛
|
d3e40d1b9e
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-07-07 10:21:36 +08:00 |
|
钱涛
|
9830b156a5
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-07-07 10:21:09 +08:00 |
|
钱涛
|
8168a42b61
|
日志
|
2025-07-07 10:20:53 +08:00 |
|
钱涛
|
b55ea81e4e
|
日志
|
2025-07-07 10:20:24 +08:00 |
|
Harryxzy
|
a7e910a672
|
联特修复
|
2025-07-04 16:47:32 +08:00 |
|
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 |
|
Harryxzy
|
2765d9be25
|
Merge remote-tracking branch 'origin/custom/联特' into custom/联特
|
2025-07-04 09:30:52 +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 |
|
钱涛
|
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 |
|
钱涛
|
45acec8468
|
上线版本
|
2025-06-19 14:40:09 +08:00 |
|
Harryxzy
|
904c053d2c
|
Merge remote-tracking branch 'origin/release/3.0.2.2504.01' into release/3.0.2.2504.01
|
2025-06-19 11:39:42 +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 |
|
钱涛
|
f5b1768438
|
利息股息红利所得sql
|
2025-06-19 10:49:29 +08:00 |
|
钱涛
|
ef1bfbdc25
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-18 17:22:14 +08:00 |