Commit Graph
16452 Commits
Author SHA1 Message Date
李鹏宇 b46bb9252c 添加功能 2026-03-04 16:34:35 +08:00
李鹏宇 a466c213fe 添加功能 2026-03-04 16:20:17 +08:00
李鹏宇 81dd4f90c9 添加功能 2026-03-04 16:12:24 +08:00
李鹏宇 87cb613710 添加功能 2026-03-04 15:49:46 +08:00
李鹏宇 8f61152b21 添加功能 2026-03-04 15:33:28 +08:00
李鹏宇 1906848fa8 添加功能 2026-03-04 15:30:28 +08:00
李鹏宇 6d95bab452 添加功能 2026-03-04 14:34:17 +08:00
李鹏宇 4c3b3eef3b 添加功能 2026-03-04 12:04:20 +08:00
李鹏宇 b9a5d03a04 添加功能 2026-03-04 12:00:13 +08:00
李鹏宇 0cf3fccb6b 添加功能 2026-03-04 11:36:50 +08:00
李鹏宇 5910bd9c63 添加功能 2026-03-04 11:30:24 +08:00
李鹏宇 051ef88ad9 添加功能 2026-03-04 11:29:36 +08:00
李鹏宇 74ace6d58d 添加功能 2026-03-04 10:48:43 +08:00
李鹏宇 07125ef0cf Merge branch 'master' into dev_zhou
# Conflicts:
#	yuthon_hr_attendance/models/yuthon_vacation_reports.py
2026-03-03 21:06:11 +08:00
李鹏宇 ca7231ee2e 添加功能 2026-03-03 21:05:19 +08:00
李鹏宇 a64e21565d !9202 !9201 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9202 from 李鹏宇/dev
2026-03-03 13:04:36 +00:00
李鹏宇 ba38c43214 !9201 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9201 from 李鹏宇/dev_wang
2026-03-03 13:04:10 +00:00
李鹏宇 ec2c04256a Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-03 21:03:33 +08:00
李鹏宇 3171002721 考勤确认单台账返回 2026-03-03 21:03:19 +08:00
李鹏宇 ac99db1451 !9200 !9199 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9200 from 李鹏宇/dev
2026-03-03 13:00:43 +00:00
李鹏宇 77a7275917 !9199 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9199 from 李鹏宇/dev_wang
2026-03-03 13:00:19 +00:00
李鹏宇 94e6b888ca !9198 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9198 from 李鹏宇/dev_wang
2026-03-03 12:59:37 +00:00
李鹏宇 3067161a4e Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-03 20:58:56 +08:00
李鹏宇 05398a64cc 考勤确认单台账返回 2026-03-03 20:58:43 +08:00
李鹏宇 a4af4fdb6a !9197 !9196 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9197 from 李鹏宇/dev
2026-03-03 12:43:45 +00:00
李鹏宇 ff37bc8f51 !9196 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9196 from 李鹏宇/dev_wang
2026-03-03 12:43:18 +00:00
李鹏宇 f3d3a9832f !9195 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9195 from 李鹏宇/dev_wang
2026-03-03 12:42:38 +00:00
李鹏宇 587da48cd2 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-03 20:41:42 +08:00
李鹏宇 8dd8db475c 考勤确认单台账切换月份 2026-03-03 20:40:59 +08:00
李鹏宇 f1fdbb8eae !9194 !9193 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9194 from 李鹏宇/dev
2026-03-03 12:24:36 +00:00
李鹏宇 5a1eab9e6d !9193 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9193 from 李鹏宇/dev_wang
2026-03-03 12:24:00 +00:00
李鹏宇 beaf744576 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-03 20:23:23 +08:00
李鹏宇 98b6406616 附件换行 2026-03-03 20:23:11 +08:00
李鹏宇 df630def5f !9192 !9186 成交确认书
Merge pull request !9192 from 李鹏宇/dev
2026-03-03 11:14:17 +00:00
李鹏宇 3cc18f0e89 !9186 成交确认书
Merge pull request !9186 from dev_wang
2026-03-03 11:13:35 +00:00
李鹏宇 a11fb5dea3 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-03 19:08:30 +08:00
李鹏宇 9b89d1ed5c 成交确认书 2026-03-03 19:08:19 +08:00
李鹏宇 13cdd8d806 !9190 !9189 添加功能
Merge pull request !9190 from 李鹏宇/dev
2026-03-03 10:59:24 +00:00
李鹏宇 5d69618bca !9189 添加功能
Merge pull request !9189 from 李鹏宇/dev_zhou
2026-03-03 10:58:56 +00:00
李鹏宇 e049219662 添加功能 2026-03-03 18:58:12 +08:00
李鹏宇 3555f93eed !9188 !9187 Merge branch 'master' into dev_zhou
Merge pull request !9188 from 李鹏宇/dev
2026-03-03 10:56:43 +00:00
李鹏宇 4ea7f667f5 !9187 Merge branch 'master' into dev_zhou
Merge pull request !9187 from 李鹏宇/dev_zhou
2026-03-03 10:55:50 +00:00
李鹏宇 562f15d38a Merge branch 'master' into dev_zhou
# Conflicts:
#	yuthon_property/models/property_accounts_receivable.py
2026-03-03 18:55:12 +08:00
李鹏宇 e1da44c930 添加功能 2026-03-03 18:53:43 +08:00
李鹏宇 da34be52d6 添加功能 2026-03-03 18:52:56 +08:00
李鹏宇 44b1b7360e Merge branch 'refs/heads/master' into dev_wang
# Conflicts:
#	yuthon_property_approval/security/ir.model.access.csv
2026-03-03 18:49:08 +08:00
李鹏宇 552babc5c8 !9185 !9184 添加功能
Merge pull request !9185 from 李鹏宇/dev
2026-03-03 10:01:27 +00:00
李鹏宇 e9d288ad88 !9184 添加功能
Merge pull request !9184 from 李鹏宇/dev_zhou
2026-03-03 10:01:11 +00:00
李鹏宇 8c01bfa458 添加功能 2026-03-03 18:00:27 +08:00
李鹏宇 0d9544d6cf 成交确认书 2026-03-03 17:45:39 +08:00