100 Commits
Author SHA1 Message Date
pengyuthon 00a6d8086d 1 2025-10-14 12:30:43 +08:00
pengyuthon 7b56ba2639 1 2025-10-14 00:09:40 +08:00
pengyuthon 81247eafc1 1 2025-10-13 09:24:35 +08:00
pengyuthon fd91536354 1 2025-10-11 11:22:21 +08:00
pengyuthon 37cadab15d 1 2025-10-10 15:02:37 +08:00
pengyuthon d7bc1bf1af 1 2025-10-10 10:06:59 +08:00
pengyuthon 8404f75f14 1 2025-10-10 09:38:53 +08:00
pengyuthon 507113b321 1 2025-10-09 21:52:16 +08:00
pengyuthon 1122bfa971 1 2025-10-09 21:49:53 +08:00
pengyuthon 8f8d98612c 1 2025-10-09 15:15:37 +08:00
pengyuthon 36f3491125 1 2025-10-09 15:01:05 +08:00
pengyuthon cb34ab87a5 1 2025-10-09 11:18:43 +08:00
pengyuthon 33ce538b7a 1 2025-10-08 21:21:04 +08:00
pengyuthon 048a2c9570 1 2025-10-08 21:12:47 +08:00
pengyuthon 17d8f91f78 1 2025-10-07 20:30:43 +08:00
pengyuthon b30073536e 1 2025-10-07 20:25:33 +08:00
pengyuthon d1a4e09612 1 2025-10-07 16:42:22 +08:00
pengyuthon dacf052740 1 2025-10-04 23:46:13 +08:00
pengyuthon c2024166e3 1 2025-10-04 16:35:45 +08:00
pengyuthon 3c660cabe0 1 2025-10-04 10:48:27 +08:00
pengyuthon 1d8999326e 1 2025-10-03 17:59:01 +08:00
pengyuthon 0cc67def5e 1 2025-10-03 17:54:35 +08:00
pengyuthon 9d14ccf4fc 1 2025-10-03 17:02:49 +08:00
pengyuthon 965713e2e6 水电表 2025-10-02 18:48:35 +08:00
pengyuthon 27dc609aa4 ljm:企业微信 消息推送 2024-07-03 22:12:50 +08:00
pengyuthon 82e16054c7 ljm:企业微信 消息推送 2024-07-03 22:11:28 +08:00
pengyuthon 10eb718159 ljm:企业微信员工创建用户 2024-07-03 21:49:03 +08:00
pengyuthon fe8bbcfed4 通知公告 2024-07-02 22:17:54 +08:00
pengyuthon 102752570e 企业微信 通步 2024-07-01 21:21:56 +08:00
pengyuthon 936f70e039 企业微信 通步 2024-07-01 20:41:30 +08:00
pengyuthon 9e92b1368e 企业微信 通步 2024-06-30 20:56:32 +08:00
pengyuthon e50f908657 企业微信 通步 2024-06-30 18:31:22 +08:00
pengyuthon ace090f017 企业微信 通步 2024-06-30 18:30:14 +08:00
pengyuthon 19f109c8ad 企业微信 通步 2024-06-30 18:27:46 +08:00
pengyuthon 76a477ae3b 议题相关 2024-06-29 22:26:34 +08:00
pengyuthon 03a6eb2ff7 议题相关 2024-06-27 15:37:08 +08:00
pengyuthon b2bb6ec37c 议题相关 2024-06-27 15:33:17 +08:00
pengyuthon ed4bb19768 议题相关 2024-06-27 15:24:00 +08:00
pengyuthon 1337189e45 议题相关 2024-06-27 14:59:25 +08:00
pengyuthon 0e2a3dafa5 议题相关 2024-06-27 14:16:47 +08:00
pengyuthon 9c9acaef0e ljm 企业微信 扫码登陆 居中 2024-06-26 18:44:31 +08:00
pengyuthon 3087ca21b6 ljm 企业微信 扫码登陆 居中 2024-06-25 22:44:38 +08:00
pengyuthon a6a70fae65 企业微信 扫码登陆 token验证 2024-06-24 22:39:31 +08:00
pengyuthon 20005a1a8f 主题 2024-06-24 18:41:50 +08:00
pengyuthon bdc901aa72 主题 2024-06-24 18:32:13 +08:00
pengyuthon 90b54f8668 主题 2024-06-24 18:16:47 +08:00
pengyuthon 9fae32fdcb 主题 2024-06-24 11:25:01 +08:00
pengyuthon 84dad8fa09 主题 2024-06-21 20:39:29 +08:00
pengyuthon db84904504 主题 2024-06-20 15:03:15 +08:00
pengyuthon e2886218ea 主题 2024-06-20 14:54:07 +08:00
pengyuthon 3ae1b45506 主题 2024-06-20 13:39:24 +08:00
pengyuthon 93d5692fa8 代码整合 2024-06-18 14:50:35 +08:00
pengyuthon 9e86876a51 代码整合 2024-06-18 14:50:18 +08:00
pengyuthon 1c57785c1e 考勤-法定节假日 2024-06-17 18:21:40 +08:00
pengyuthon 9f527098fb Merge branch 'master' into dev 2024-06-17 18:21:21 +08:00
pengyuthon d813491abd 考勤-法定节假日 2024-06-15 18:26:49 +08:00
pengyuthon 6b146d6d50 考勤-法定节假日 2024-06-15 18:25:43 +08:00
pengyuthon 851927bd37 考勤-法定节假日 2024-06-15 14:44:52 +08:00
pengyuthon b5775c4f0d Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	clarity_backend_theme_bits/__manifest__.py
#	clarity_backend_theme_bits/static/src/js/WebClient.js
#	clarity_backend_theme_bits/static/src/xml/navbar/sidebar.xml
#	clarity_backend_theme_bits/static/src/xml/systray_items/user_menu.xml
#	clarity_backend_theme_bits/views/res_config_setting.xml
#	clarity_backend_theme_bits/views/res_users.xml
2024-06-14 16:25:05 +08:00
pengyuthon d6cf1ff349 审批 2024-06-14 16:24:02 +08:00
pengyuthon e62d4a7382 审批 2024-06-14 16:23:13 +08:00
pengyuthon 0683b98344 审批 2024-06-11 15:40:52 +08:00
pengyuthon a536122c77 审批 2024-06-06 21:44:34 +08:00
pengyuthon bd397a681e 审批 2024-06-06 17:35:39 +08:00
pengyuthon d2821afc23 审批 2024-06-05 21:55:28 +08:00
pengyuthon ace2abda56 审批 2024-06-04 16:47:24 +08:00
pengyuthon 00cabca3fb 审批 2024-06-02 22:30:47 +08:00
pengyuthon 4f02645405 审批 2024-06-01 23:18:40 +08:00
pengyuthon 5e840aaedc Merge branch 'master' into dev-pengyuthon
# Conflicts:
#	yuthon_approval/views/inherit_approval_category_views.xml
2024-06-01 22:26:45 +08:00
pengyuthon f48a3c1e6f 审批 2024-06-01 22:25:52 +08:00
pengyuthon de8fdeacd9 审批 2024-06-01 22:15:23 +08:00
pengyuthon 013bd24239 审批 2024-06-01 17:15:27 +08:00
pengyuthon 8a4b28f97f 审批 2024-06-01 15:34:49 +08:00
pengyuthon 81126bdc6b 审批 2024-06-01 15:20:30 +08:00
pengyuthon 23715f9098 审批 2024-05-31 19:30:52 +08:00
pengyuthon 703c659104 Merge branch 'master' into dev-pengyuthon
# Conflicts:
#	tianhe_approvals/__manifest__.py
#	tianhe_approvals/data/approval_category_type_data.xml
#	tianhe_approvals/models/inherit_approval_category.py
#	yuthon_approval/views/demo_approval_request.xml
2024-05-31 19:25:23 +08:00
pengyuthon 062fb5d882 审批 2024-05-31 18:53:32 +08:00
pengyuthon 8ecf9a9642 审批 2024-05-31 18:37:33 +08:00
pengyuthon 207ee2d8d6 审批采购 2024-05-31 16:06:06 +08:00
pengyuthon 1cbb43e702 审批采购 2024-05-30 19:01:17 +08:00
pengyuthon 928ba9dd58 审批采购 2024-05-30 19:00:39 +08:00
pengyuthon fa4a29ef37 审批二开 2024-05-30 14:16:04 +08:00
pengyuthon 30c77faf32 审批二开 2024-05-29 22:02:27 +08:00
pengyuthon 10b74b7189 代码优化 2024-05-29 16:13:44 +08:00
pengyuthon c152bcfb1d 代码优化 2024-05-28 20:56:09 +08:00
pengyuthon c93dbedf65 审批二开 2024-05-28 20:05:16 +08:00
pengyuthon ca79e6c698 审批二开 2024-05-27 18:35:32 +08:00
pengyuthon ed8dec72ee 批量员工更新 2024-05-22 18:59:02 +08:00
pengyuthon fc6037651c bug 2024-05-20 17:54:15 +08:00
pengyuthon 008a3b996d bug 2024-05-19 23:30:07 +08:00
pengyuthon 974fc5f0ce bug 2024-05-19 20:52:12 +08:00
pengyuthon d0304a71aa bug 2024-05-19 14:17:39 +08:00
pengyuthon b0aa266c2f 审批框架二开 2024-05-19 14:06:41 +08:00
pengyuthon bcee2fe0e1 职级调整,数据的预置 2024-05-08 10:13:24 +08:00
pengyuthon 60ee1a6239 职级调整,数据的预置 2024-05-06 18:15:12 +08:00
pengyuthon 651bf4bde4 Merge branch 'master' into pengyuthon-dev 2024-05-05 22:47:55 +08:00
pengyuthon 10a2ff2c97 职级调整 2024-05-05 22:47:23 +08:00
pengyuthon f6424f03d1 部门-上级部门添加 2024-05-04 22:42:48 +08:00
李鹏宇 e3de79944d 测试 2024-04-13 19:42:18 +08:00
李鹏宇 8d01b177c2 教学测试 2024-04-13 19:38:41 +08:00