Commit Graph

2531 Commits

Author SHA1 Message Date
Harryxzy 774e957da2 fix薪资项目设置可行性为私有时,无法定薪调薪 2024-01-24 18:06:13 +08:00
Harryxzy 3f592d0278 万众薪资审批导出 2024-01-18 13:48:31 +08:00
Harryxzy 47c0666533 陕西万众优化 2024-01-10 17:21:58 +08:00
Harryxzy ca28b44a34 陕西万众fix 2024-01-10 09:29:47 +08:00
Harryxzy ab679fa713 陕西薪资核算模板 2024-01-09 10:07:46 +08:00
Harryxzy ef7384281e 陕西万众审批项目顺序 2024-01-08 18:10:06 +08:00
Harryxzy 8f959cb83b 陕西万众核算模板 2024-01-08 10:15:12 +08:00
Harryxzy 584237bc10 陕西万众 2024-01-05 16:43:50 +08:00
Harryxzy 2526bb9c6a sql 2024-01-04 10:05:51 +08:00
Harryxzy c1dbe396ba 万众,薪资核算模板 2024-01-03 10:50:27 +08:00
Harryxzy 1ba00091df 陕西万众 2024-01-02 16:49:58 +08:00
Harryxzy 2bcf53585b 万众temp 2024-01-02 15:45:55 +08:00
Harryxzy 53fb439916 Merge branch 'feature/240101_工资单发送action' into custom/陕西万众 2024-01-02 14:47:20 +08:00
Harryxzy fe00f5c0e7 工资单发送action 2024-01-02 14:40:33 +08:00
Harryxzy 7678fa00ef 陕西万众,审批temp 2024-01-02 10:53:27 +08:00
Harryxzy f03c0d0147 薪资项目同步至账套功能,过滤没有权限的账套 2023-12-29 10:27:35 +08:00
钱涛 7e22711dcd 导入工具 2023-12-28 15:47:05 +08:00
钱涛 06fe3144ba 导入模板 2023-12-28 15:37:01 +08:00
Harryxzy e976c7aaec oracle工资单模板保存异常 2023-12-27 09:32:31 +08:00
Harryxzy 2ed856ac18 Merge branch 'fix/231202-个税扣缴以为人根据名称查询' into release/2.9.10.2312.02 2023-12-25 16:32:11 +08:00
Harryxzy e67cb5bf83 个税扣缴义务人like分成3个 2023-12-25 16:31:36 +08:00
钱涛 e8223a832b 缓存识别条件 2023-12-16 12:40:33 +08:00
钱涛 bda3d7080b 缓存识别条件 2023-12-16 12:36:56 +08:00
钱涛 4f8606b00e 缓存识别条件 2023-12-16 12:35:24 +08:00
Harryxzy 14cb45f4bc Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02 2023-12-14 16:00:46 +08:00
Harryxzy 85f009984c Merge branch 'fix/231202_补发工资单回算项' into release/2.9.10.2312.02 2023-12-14 16:00:24 +08:00
Harryxzy e97a35f158 新建补发工资单模板时,已发补发项目fix 2023-12-14 15:57:55 +08:00
钱涛 d53897d147 Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02 2023-12-14 10:40:06 +08:00
钱涛 96d37b1b68 修复申报表明细 2023-12-14 10:39:49 +08:00
Harryxzy cfbddef42a 核算记录归档action 2023-12-13 09:58:00 +08:00
Harryxzy 5fba05bc43 Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01 2023-12-12 14:22:44 +08:00
Harryxzy 51022c0a16 薪资核算结果、线下对比下载导入模板优化fix 2023-12-12 14:22:18 +08:00
Harryxzy d38ef4769b Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01 2023-12-12 14:12:19 +08:00
Harryxzy 5c50b61cd5 Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01 2023-12-12 14:12:14 +08:00
Harryxzy 9602e48e74 薪资核算结果、线下对比下载导入模板优化fix 2023-12-12 14:11:48 +08:00
钱涛 b78f4302e0 小数位 2023-12-12 13:18:17 +08:00
Harryxzy 9c454623bc Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01 2023-12-12 10:32:30 +08:00
Harryxzy 559ba88e9f 薪资核算结果、线下对比下载导入模板优化 2023-12-12 10:32:04 +08:00
Harryxzy 929bcc7877 薪资核算结果、线下对比下载导入模板优化 2023-12-12 10:18:10 +08:00
钱涛 04e3225c98 自适应 2023-12-12 10:07:31 +08:00
钱涛 e495c1799f 自定义 2023-12-11 09:52:47 +08:00
Harryxzy 8138b5297f 薪酬报表添加文本统计项目时,字符去值规则没有保存进去 2023-12-08 11:41:13 +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
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