diff --git a/yuthon_wechat/__manifest__.py b/yuthon_wechat/__manifest__.py index 2b80af752..adf4e43c9 100644 --- a/yuthon_wechat/__manifest__.py +++ b/yuthon_wechat/__manifest__.py @@ -23,6 +23,7 @@ 'data/auth_oauth_provider.xml', 'views/wecom_api_views.xml', 'views/wecom_apps_views.xml', + 'views/hr_employee_views.xml', 'wizard/wecom_api_sync_wizard.xml' ], 'application': True, diff --git a/yuthon_wechat/models/__init__.py b/yuthon_wechat/models/__init__.py index 63b343f5f..2858b54eb 100644 --- a/yuthon_wechat/models/__init__.py +++ b/yuthon_wechat/models/__init__.py @@ -3,6 +3,7 @@ from . import wecom_api from . import wecom_apps +from . import hr_employee from . import res_users diff --git a/yuthon_wechat_employee/models/hr_employee.py b/yuthon_wechat/models/hr_employee.py similarity index 100% rename from yuthon_wechat_employee/models/hr_employee.py rename to yuthon_wechat/models/hr_employee.py diff --git a/yuthon_wechat_employee/views/hr_employee_views.xml b/yuthon_wechat/views/hr_employee_views.xml similarity index 100% rename from yuthon_wechat_employee/views/hr_employee_views.xml rename to yuthon_wechat/views/hr_employee_views.xml diff --git a/yuthon_wechat_employee/__init__.py b/yuthon_wechat_employee/__init__.py deleted file mode 100644 index 77bbdbd39..000000000 --- a/yuthon_wechat_employee/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# -*- coding: utf-8 -*- - -from . import models - diff --git a/yuthon_wechat_employee/__manifest__.py b/yuthon_wechat_employee/__manifest__.py deleted file mode 100644 index 13921af09..000000000 --- a/yuthon_wechat_employee/__manifest__.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -{ - 'name': 'yuthon_wechat_employee', - 'version': '17.0.1.0', - 'category': '员工对接企业微信', - 'description': """ -功能介绍 -============== -* 员工同步 - """, - 'depends': ['hr', 'yuthon_wechat'], - 'data': [ - 'views/hr_employee_views.xml', - ], - 'application': True, - 'installable': True, - 'auto_install': False, -} diff --git a/yuthon_wechat_employee/models/__init__.py b/yuthon_wechat_employee/models/__init__.py deleted file mode 100644 index 798568073..000000000 --- a/yuthon_wechat_employee/models/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ - -from . import hr_employee diff --git a/yuthon_wechat_employee/static/description/icon.png b/yuthon_wechat_employee/static/description/icon.png deleted file mode 100644 index 5cca7ac8b..000000000 Binary files a/yuthon_wechat_employee/static/description/icon.png and /dev/null differ