Commit Graph

3241 Commits

Author SHA1 Message Date
Harryxzy cca73dcc7a 京贵投资二开 - 导出格式调整 2024-11-13 15:46:15 +08:00
钱涛 879561aed4 Merge remote-tracking branch 'origin/custom/京贵投资' into custom/京贵投资 2024-11-11 18:15:09 +08:00
Harryxzy 9b8920af21 京贵投资二开 - 可配置薪资核算记录 某些员工不可删除 2024-11-11 18:14:32 +08:00
钱涛 515e3eb401 Merge branch 'release/2.16.1.2410.01' into custom/京贵投资 2024-11-11 18:08:16 +08:00
钱涛 4601d5ec81 修复打印模板列表不显示 2024-11-11 18:03:31 +08:00
钱涛 99274b95ec 修复打印模板列表不显示 2024-11-11 16:58:16 +08:00
钱涛 bb7d21eb25 打印功能 2024-11-11 16:19:10 +08:00
Harryxzy 44c47122e0 京贵投资二开 - 可配置薪资核算不可删除人员 2024-11-11 16:12:30 +08:00
Harryxzy 02de1e4444 工资单发放预览,兼容很早之前新建的工资单模板 2024-11-11 15:02:21 +08:00
Harryxzy 6ebef0cd5e Merge remote-tracking branch 'origin/release/2.16.1.2410.01' into release/2.16.1.2410.01 2024-11-11 14:06:37 +08:00
Harryxzy 95abadfb0d 社保福利台账添加人员bug 2024-11-11 14:06:15 +08:00
钱涛 740acc1773 打印功能 2024-11-11 13:58:47 +08:00
钱涛 6d17a81161 Merge branch 'release/2.16.1.2410.01' into custom/京贵投资 2024-11-11 10:52:28 +08:00
钱涛 553764da86 模板sql 2024-11-11 10:51:59 +08:00
Harryxzy ce80905ad0 薪资明细接口优化 2024-11-11 09:59:27 +08:00
钱涛 7aa3d12d4f 模板sql 2024-11-08 17:00:42 +08:00
钱涛 f32752119d Merge branch 'release/2.16.1.2410.01' into custom/京贵投资 2024-11-08 16:32:17 +08:00
Harryxzy 11f2591797 Merge branch 'feature/241101-定薪action支持不设为发薪人员' into release/2.16.1.2410.01 2024-11-08 16:30:53 +08:00
Harryxzy 32eabb25f0 Merge branch 'feature/241101_薪资档案增加调薪筛选' into release/2.16.1.2410.01 2024-11-08 16:30:40 +08:00
Harryxzy 058e7dcb3c 薪资档案增加调薪时间 筛选 2024-11-08 16:29:06 +08:00
钱涛 7e235e112a 处理核算结果null插入问题 2024-11-08 16:20:30 +08:00
Harryxzy a2f8803e76 薪资档案增加调薪时间 筛选 2024-11-08 16:08:49 +08:00
钱涛 e537ffaa5a 薪资明细显示模板 2024-11-07 17:45:17 +08:00
Harryxzy 15fe5044e8 修复先加锁 再核算时报错 2024-11-07 15:19:11 +08:00
Harryxzy 5953c2b938 薪酬token加解密 2024-11-06 13:37:03 +08:00
Harryxzy dbb332e07f Merge branch 'release/2.16.1.2410.01' into fix/240901_token加解密 2024-11-06 10:05:53 +08:00
Harryxzy 13012b739e 定薪action支持配置留在待定薪 2024-11-05 16:22:48 +08:00
Harryxzy 1026599131 Merge remote-tracking branch 'origin/release/2.16.1.2410.01' into release/2.16.1.2410.01 2024-11-05 14:35:15 +08:00
Harryxzy cb6738734a 修复社保福利档案导出,一个人在多个义务人下 导出bug 2024-11-05 11:04:21 +08:00
钱涛 4cd0fbfe30 报表模板 2024-11-04 19:49:46 +08:00
钱涛 1db46fb900 Merge branch 'release/2.16.1.2410.01' into custom/京贵投资 2024-11-04 15:18:34 +08:00
钱涛 ea06150dc5 取消社保台账重新核算限制 2024-11-04 15:06:27 +08:00
钱涛 e3d5ca78f4 修改账套状态类型 2024-11-04 10:53:21 +08:00
Harryxzy 906a432ec2 Merge branch 'fix/241001-社保停缴action最后缴纳月支持分开设置' into release/2.16.1.2410.01 2024-11-01 14:34:14 +08:00
Harryxzy 989468cdc7 Merge branch 'feature/241001-社保台账人员信息快照' into release/2.16.1.2410.01 2024-11-01 14:33:14 +08:00
钱涛 7fd0f95802 扣缴义务人和账套的人员的人员状态 2024-11-01 14:27:47 +08:00
钱涛 391fa6ebd9 扣缴义务人和账套的人员的人员状态 2024-11-01 10:04:15 +08:00
钱涛 ad48063ca9 扣缴义务人和账套的人员范围支持编辑 2024-10-31 16:56:32 +08:00
钱涛 d21258596a 扣缴义务人新加入人员,不会修改历史档案 2024-10-30 17:10:32 +08:00
钱涛 2b83396592 二开,同步全勤奖标准 2024-10-29 14:09:24 +08:00
钱涛 147970effc Merge branch 'release/2.16.1.2410.01' into custom/京贵投资 2024-10-28 17:53:49 +08:00
钱涛 455550836e 解决账套项目过多,快照问题 2024-10-28 15:46:29 +08:00
钱涛 bfbd9e4b40 修复人员报表排序 2024-10-28 11:35:57 +08:00
钱涛 71569cad9e 薪资所属年变量 2024-10-25 16:01:45 +08:00
钱涛 c97a4aef91 Merge branch 'release/2.16.1.2410.01' into custom/京贵投资 2024-10-24 11:04:17 +08:00
钱涛 c0de305c3d 核算记录最后操作日期 2024-10-24 10:55:44 +08:00
钱涛 28fa294c6f 异步记录日志 2024-10-24 10:19:35 +08:00
钱涛 e3c6b08e6f 处理报表导出异常 2024-10-23 17:41:28 +08:00
钱涛 b5e6059298 核算记录组织字段分开标识 2024-10-22 16:38:27 +08:00
钱涛 ce8356f9b2 分部id字段 2024-10-22 16:12:30 +08:00