Commit Graph

2949 Commits

Author SHA1 Message Date
钱涛 4b0eee4798 工资单跨扣缴义务人发放 2024-09-04 15:39:54 +08:00
钱涛 5ccee97429 新建账套携带各扣缴义务人人员范围 2024-09-04 13:59:00 +08:00
钱涛 e7eb2e3459 支持跨扣缴义务人兼容性 2024-09-03 15:48:20 +08:00
钱涛 e788f3dd37 申报表支持跨扣缴义务人 2024-09-03 14:46:08 +08:00
钱涛 0b90f4890e 工资单支持跨扣缴义务人 2024-09-03 14:30:57 +08:00
钱涛 7f77f4cb12 获取账套关联扣缴义务人 2024-09-03 09:21:57 +08:00
钱涛 ecfa6a4604 跨扣缴义务人核算 2024-09-02 17:36:41 +08:00
钱涛 c72fa7fd7c 保存账套联系 2024-09-02 14:13:29 +08:00
钱涛 13665d8269 业务线列表 2024-09-02 10:43:28 +08:00
钱涛 fdb1f76e01 保存业务线 2024-09-02 10:22:42 +08:00
钱涛 9d4362b46e 业务线分权 2024-08-30 17:22:10 +08:00
钱涛 49e6050c54 核算和账套的权限 2024-08-30 10:49:46 +08:00
钱涛 932ea6bedd 核算和账套的权限 2024-08-29 14:47:33 +08:00
钱涛 3721867723 核算和账套的权限 2024-08-28 17:55:42 +08:00
钱涛 9b96d0cff2 限制账套 2024-08-28 10:02:39 +08:00
钱涛 a2db71d403 Merge branch 'release/2.15.1.2407.01' into feature/权限 2024-08-26 11:11:31 +08:00
钱涛 42e91e32da 改为通过快照信息搜索 2024-08-26 09:26:42 +08:00
钱涛 36c325c62d sql权限 2024-08-23 09:38:54 +08:00
钱涛 df8f2d7b3a sql权限 2024-08-22 16:37:35 +08:00
钱涛 a22aa624db 权限控制 2024-08-22 15:37:50 +08:00
钱涛 25321bb357 Merge branch 'release/2.15.1.2407.01' into feature/权限 2024-08-21 15:49:12 +08:00
Harryxzy 59820f6aca Merge branch 'fix/240801-核算导入支持vlookup' into release/2.15.1.2407.01 2024-08-20 14:03:58 +08:00
Harryxzy 2a58b4972b 薪资核算导入支持vlookup函数 2024-08-20 13:48:31 +08:00
钱涛 9fae93fcd7 Merge branch 'feature/导入工具' into release/2.15.1.2407.01 2024-08-20 11:40:33 +08:00
钱涛 ae3d666e7d 核算和申报权限 2024-08-20 11:40:12 +08:00
钱涛 9121268815 修复重新导入账套bug 2024-08-20 09:29:14 +08:00
钱涛 7c46da5fce 删除数据范围 2024-08-19 15:29:45 +08:00
钱涛 9b390faf50 SQL适配 2024-08-19 11:33:15 +08:00
钱涛 a796752203 Merge branch 'release/2.15.1.2407.01' into feature/权限
# Conflicts:
#	src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
2024-08-19 10:43:43 +08:00
钱涛 cd8d4601af 全量迁移配置 2024-08-19 09:49:49 +08:00
Harryxzy 8742ee7857 Merge branch 'fix/240801-工资明细导出excel单元格格式' into release/2.15.1.2407.01 2024-08-16 15:27:15 +08:00
钱涛 22c99e081d 支持Vlookup 2024-08-16 14:39:01 +08:00
钱涛 4b9341cc98 支持Vlookup 2024-08-16 14:13:59 +08:00
钱涛 4b30292c6c 支持Vlookup 2024-08-16 14:07:16 +08:00
钱涛 d23baeb940 支持Vlookup 2024-08-16 12:19:18 +08:00
钱涛 673699dfb8 导入工具明细 2024-08-16 11:18:27 +08:00
Harryxzy be6e7bb787 工资明细导出excel单元格格式 2024-08-16 11:08:57 +08:00
钱涛 7250ed3520 修复组织信息快照,主动添加或者sql添加人员丢失 2024-08-15 17:03:17 +08:00
钱涛 980dc2f532 导入工具 2024-08-15 16:25:31 +08:00
钱涛 c079b1d2e6 Merge branch 'release/2.15.1.2407.01' into feature/导入工具 2024-08-15 13:48:14 +08:00
钱涛 22ccad05ad 排除显示 2024-08-15 13:47:55 +08:00
钱涛 5071c08d8c Merge branch 'release/2.15.1.2407.01' into feature/导入工具
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
2024-08-15 13:41:52 +08:00
钱涛 c5c469e4c4 修复邮件不显示入职日期 2024-08-15 11:54:18 +08:00
Harryxzy e9fef7d915 Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-15 11:10:49 +08:00
Harryxzy 4348954994 Merge branch 'feature/240801-报表义务人、账套分权' into release/2.15.1.2407.01 2024-08-15 11:09:09 +08:00
钱涛 2b2e9ea504 账套支持sql范围 2024-08-15 10:53:08 +08:00
钱涛 d37434521d Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-15 10:37:57 +08:00
钱涛 f74ec99644 账套支持sql范围 2024-08-15 10:37:41 +08:00
钱涛 6450254371 薪酬迁移工具 2024-08-14 14:47:27 +08:00
Harryxzy 832a6ac1ec 社保福利台账明细导入2100bug 2024-08-14 11:17:56 +08:00