From 1660268a1862e162d298359889c1507d80e71a3c Mon Sep 17 00:00:00 2001 From: ljmwkx <1340053001@qq.com> Date: Sat, 4 May 2024 10:40:57 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_menuitem/i18n/zh_CN.po | 99 ++++++++++++++++----- yuthon_menuitem/models/__init__.py | 1 - yuthon_menuitem/models/base.py | 7 -- yuthon_menuitem/views/menuitem_sequence.xml | 75 +++++++++++++--- 4 files changed, 142 insertions(+), 40 deletions(-) delete mode 100644 yuthon_menuitem/models/__init__.py delete mode 100644 yuthon_menuitem/models/base.py diff --git a/yuthon_menuitem/i18n/zh_CN.po b/yuthon_menuitem/i18n/zh_CN.po index 5387fc3b0..8c16bf10e 100644 --- a/yuthon_menuitem/i18n/zh_CN.po +++ b/yuthon_menuitem/i18n/zh_CN.po @@ -1,28 +1,83 @@ # Translation of Odoo Server. -# This file contains the translation of the following modules: -# * approvals -# -# Translators: -# Martin Trigaux, 2021 -# xu aaron, 2021 -# 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2022 -# msgid "" msgstr "" -"Project-Id-Version: Odoo Server saas~14.5+e\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-14 10:59+0000\n" -"PO-Revision-Date: 2021-09-14 12:38+0000\n" -"Last-Translator: 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2022\n" -"Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Language: zh_CN\n" -"Plural-Forms: nplurals=1; plural=0;\n" -#. module: approvals2 -#: model:ir.ui.menu,name:approvals2.approvals_menu_root +#. module: project +#. odoo-javascript +#. odoo-python +#: model:ir.ui.menu,name:project.menu_main_pm +#, python-format +msgid "Project" +msgstr "项目管理" + +#. module: approvals +#. odoo-javascript +#. odoo-python #: model:ir.ui.menu,name:approvals.approvals_menu_root +#, python-format msgid "Approvals" -msgstr "流程中心" \ No newline at end of file +msgstr "流程中心" + +#. module: hr +#. odoo-javascript +#. odoo-python +#: model:ir.ui.menu,name:hr.menu_hr_root +#, python-format +msgid "Employees" +msgstr "人力资源" + +#. module: documents +#. odoo-javascript +#. odoo-python +#: model:ir.ui.menu,name:documents.menu_root +#, python-format +msgid "Documents" +msgstr "文档管理" + +#. module: sale_renting +#. odoo-javascript +#. odoo-python +#: model:ir.ui.menu,name:sale_renting.rental_menu_root +#, python-format +msgid "Rental" +msgstr "物业系统" + +#. module: room +#. odoo-javascript +#. odoo-python +#: model:ir.ui.menu,name:room.room_menu_root +#, python-format +msgid "Meeting Rooms" +msgstr "会议管理" + +#. module: purchase +#. odoo-javascript +#. odoo-python +#: model:ir.ui.menu,name:purchase.menu_purchase_root +#, python-format +msgid "Purchase" +msgstr "办公用品管理" + +#. module: fleet +#. odoo-javascript +#. odoo-python +#: model:ir.ui.menu,name:fleet.menu_root +#, python-format +msgid "Fleet" +msgstr "车辆管理" + +#. module: website_slides +#. odoo-javascript +#. odoo-python +#: model:ir.ui.menu,name:website_slides.website_slides_menu_root +#, python-format +msgid "eLearning" +msgstr "培训学习" + +#. module: website +#. odoo-javascript +#. odoo-python +#: model:ir.ui.menu,name:website.menu_website_configuration +#, python-format +msgid "Website" +msgstr "门户网站" diff --git a/yuthon_menuitem/models/__init__.py b/yuthon_menuitem/models/__init__.py deleted file mode 100644 index 0e4444933..000000000 --- a/yuthon_menuitem/models/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import base diff --git a/yuthon_menuitem/models/base.py b/yuthon_menuitem/models/base.py deleted file mode 100644 index ab357044b..000000000 --- a/yuthon_menuitem/models/base.py +++ /dev/null @@ -1,7 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import api, fields, models, modules - - -class IrUiMenu(models.Model): - _inherit = 'ir.ui.menu' - name = fields.Char(translate=True) \ No newline at end of file diff --git a/yuthon_menuitem/views/menuitem_sequence.xml b/yuthon_menuitem/views/menuitem_sequence.xml index c98870f85..c56b6533c 100644 --- a/yuthon_menuitem/views/menuitem_sequence.xml +++ b/yuthon_menuitem/views/menuitem_sequence.xml @@ -1,18 +1,73 @@ - - - - - + + 项目管理 + 2 + - - + + 流程中心 + 3 + + + + 人力资源 + 5 + + + + 文档管理 + 6 + + + + 物业系统 + 7 + + + + 会议管理 + 8 + + + + 办公用品管理 + 9 + + + + 固定资产管理 + 10 + + + + 车辆管理 + 11 + + + + 培训学习 + 12 + + + + 门户网站 + 13 + + + + + + + + + + - - - + + + From 57e50aa43a8e8808c4573ed396f0184b8a95fa02 Mon Sep 17 00:00:00 2001 From: ljmwkx <1340053001@qq.com> Date: Sat, 4 May 2024 10:42:17 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_menuitem/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuthon_menuitem/__init__.py b/yuthon_menuitem/__init__.py index cde864bae..faaaf799c 100644 --- a/yuthon_menuitem/__init__.py +++ b/yuthon_menuitem/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -from . import models + From d97aa512ddbd0df81231cde2f3edc72bb76682f3 Mon Sep 17 00:00:00 2001 From: ljmwkx <1340053001@qq.com> Date: Sat, 4 May 2024 11:51:18 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_menuitem/views/menuitem_sequence.xml | 28 +++++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/yuthon_menuitem/views/menuitem_sequence.xml b/yuthon_menuitem/views/menuitem_sequence.xml index c56b6533c..1facbc6ef 100644 --- a/yuthon_menuitem/views/menuitem_sequence.xml +++ b/yuthon_menuitem/views/menuitem_sequence.xml @@ -36,10 +36,11 @@ 9 - - 固定资产管理 - 10 - + + + + + 车辆管理 @@ -56,6 +57,23 @@ 13 + + 讨论 + 14 + + + + 讨论 + 14 + + + + 代办 + 15 + + + + @@ -64,7 +82,7 @@ - + From 2c7e9a89b7977bc75b8a18c7c7773e260ff459af Mon Sep 17 00:00:00 2001 From: ljmwkx <1340053001@qq.com> Date: Sat, 4 May 2024 12:06:51 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_menuitem/views/menuitem_sequence.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/yuthon_menuitem/views/menuitem_sequence.xml b/yuthon_menuitem/views/menuitem_sequence.xml index 1facbc6ef..eaf693774 100644 --- a/yuthon_menuitem/views/menuitem_sequence.xml +++ b/yuthon_menuitem/views/menuitem_sequence.xml @@ -72,6 +72,11 @@ 15 + + 日历 + 16 + + From 8cf3a9282cff2c612703bd4c14026b6dcfda7b03 Mon Sep 17 00:00:00 2001 From: ljmwkx <1340053001@qq.com> Date: Sat, 4 May 2024 12:13:55 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_required_mark/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuthon_required_mark/__manifest__.py b/yuthon_required_mark/__manifest__.py index 1140b555f..7f46557cf 100644 --- a/yuthon_required_mark/__manifest__.py +++ b/yuthon_required_mark/__manifest__.py @@ -11,7 +11,7 @@ 'category': 'Tools', 'version': '0.1', - 'depends': ['base', 'web', 'yuthon_announcement'], + 'depends': ['base', 'web'], 'assets': { 'web.assets_backend': [ From 8910a6824f61b6ec99de621343b33ad56623eed9 Mon Sep 17 00:00:00 2001 From: ONIONZHAOXI <2275333053@qq.com> Date: Sat, 4 May 2024 17:41:37 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BA=BA=E4=BA=8B=E6=9D=BF=E5=9D=97?= =?UTF-8?q?=E7=9A=84=E6=8B=93=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/yuthon_hr_employee.py | 45 +++++++++++++++++++ .../views/yuthon_hr_employee_views.xml | 43 +++++++++++++----- 2 files changed, 76 insertions(+), 12 deletions(-) diff --git a/yuthon_hr_employee/models/yuthon_hr_employee.py b/yuthon_hr_employee/models/yuthon_hr_employee.py index ef69718cc..124a0592b 100644 --- a/yuthon_hr_employee/models/yuthon_hr_employee.py +++ b/yuthon_hr_employee/models/yuthon_hr_employee.py @@ -50,6 +50,8 @@ class YuthonHrEmployee(models.Model): new_start_contract_data = fields.Date(string="最新合同开始日期") new_end_contract_data = fields.Date(string="最新合同终止日期") open_start_time = fields.Date(string="参加工作时间") + social_insurance_date = fields.Date(string="开始缴纳社保日期") + social_insurance_time = fields.Integer(string="社保时长") open_start_time_today = fields.Date(string="参加工作时间至今") interrupt_work_month = fields.Integer(string="中断工作月数") cumulative_work_month = fields.Integer(string="累计工作月数") @@ -81,4 +83,47 @@ class YuthonHrEmployee(models.Model): # 假期 user_year_holiday_hours = fields.Float(string="已用年假") remainder_year_holiday_hours = fields.Float(string="剩余年假") + cumulative_remainder_visit_hours = fields.Float(string="累计剩余探亲假") all_year_holiday_hours = fields.Float(string="年假总数(小时)") + + # 其他信息 + employment_registration = fields.Text(string="就业登记办理情况") + seniority_prize_pick_up_status= fields.Text(string="工龄相关年功奖领取情况") + + @api.onchange('social_insurance_date') + def onchange_insurance_time(self): + for social in self: + social.social_insurance_time = (fields.Datetime.now().date() - social.social_insurance_date).days + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml index 466eea180..27374ebda 100644 --- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml +++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml @@ -24,16 +24,20 @@ - + - + - + @@ -106,18 +110,20 @@ - - - - - - - - + + + + + + + + + + - + @@ -131,9 +137,22 @@ + + + + + + + + + + + + + \ No newline at end of file From 16b91df0bc819a0ef33651ddf11ffb2e2ed11693 Mon Sep 17 00:00:00 2001 From: ONION <2275333053@qq.com> Date: Sat, 4 May 2024 13:07:56 +0800 Subject: [PATCH 7/9] =?UTF-8?q?OA=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_hr_employee/__manifest__.py | 1 + yuthon_hr_employee/date/user_role_date.xml | 399 ++++++++++++++++++ yuthon_hr_employee/models/yuthon_user_role.py | 18 +- 3 files changed, 417 insertions(+), 1 deletion(-) create mode 100644 yuthon_hr_employee/date/user_role_date.xml diff --git a/yuthon_hr_employee/__manifest__.py b/yuthon_hr_employee/__manifest__.py index 332fc8051..401fb3e40 100644 --- a/yuthon_hr_employee/__manifest__.py +++ b/yuthon_hr_employee/__manifest__.py @@ -13,6 +13,7 @@ 'website': 'https://www.pengyuthon.com', 'depends': ['hr'], 'data': [ + 'date/user_role_date.xml', 'security/ir.model.access.csv', 'views/yuthon_hr_employee_views.xml', 'views/yuthon_job_lv_views.xml', diff --git a/yuthon_hr_employee/date/user_role_date.xml b/yuthon_hr_employee/date/user_role_date.xml new file mode 100644 index 000000000..4b28b6f68 --- /dev/null +++ b/yuthon_hr_employee/date/user_role_date.xml @@ -0,0 +1,399 @@ + + + + 普通员工 + System global role + + + + 常务副秘书长 + Departmental private role + association + + + + 总经理 + System global role + + + + 理事长 + System global role + + + + 常务副会长 + System global role + + + + 副总经理 + System global role + + + + 监事会主席 + System global role + + + + 秘书处办公室主任 + System global role + + + + 分管领导 + System global role + + + + 部门副经理 + System global role + + + + 秘书处办公室副主任 + System global role + + + + 部门经理 + System global role + + + + 各企业班子（发文） + System global role + + + + 试用期员工 + System global role + + + + 物业部副总经理 + Departmental private role + Leasing Department II (Former Property Management Department + + + + 理事会成员 + System global role + + + + 安全办成员 + System global role + + + + 实习 + System global role + + + + 副院长 + System global role + + + + 院长 + System global role + + + + 党员 + System global role + + + + 科创中心 + System global role + + + + 需考勤人员 + System global role + + + + 财务(物业) + System global role + + + + 集团安委会 + System global role + + + + + 天投城建安全办 + System global role + + + + 集团安全办 + System global role + + + + 天投城建安委会 + System global role + + + + 天投城建安委会 + System global role + + + + 公司领导 + System global role + + + + 领导班子 + System global role + + + + 董事长 + System global role + + + + 执行董事 + Departmental private role + Grain storage company + + + + + 秘书长 + Departmental private role + association + + + + 副主任 + System global role + + + + 工会委员 + System global role + + + + 风控审计经理 + Departmental private role + Risk Control Audit Department + + + + 风控管理岗 + Departmental private role + Risk Control Audit Department + + + + 系统管理员 + OA administrator + + + + 安全办副主任 + System global role + + + + 投融资部经理 + Departmental private role + Capital Operations Department + + + + 投融资部副总经理 + Departmental private role + Capital Operations Department + + + + 投融资部副经理 + Departmental private role + Capital Operations Department + + + + 投融资发展部 + Departmental private role + Capital Operations Department + + + + 项目开发部 + Departmental private role + Investment development department + + + + 项目部经理 + Departmental private role + Investment development department + + + + + 人事专员 + Departmental private role + Party and Mass Human Resources Department + + + + 党建专员 + Departmental private role + Party and Mass Human Resources Department + + + + + 人事管理员 + Departmental private role + Party and Mass Human Resources Department + + + + 人事主管 + Departmental private role + Party and Mass Human Resources Department + + + + 物业部 + Departmental private role + Leasing Department II (Former Property Management Department + + + + 物业部经理 + Departmental private role + Leasing Department II (Former Property Management Department + + + + 物业部副经理 + Departmental private role + Leasing Department II (Former Property Management Department + + + + 工程主管 + Departmental private role + Leasing Department II (Former Property Management Department + + + + 企业管理部 + Departmental private role + enterprise management department + + + + 企业管理部经理 + Departmental private role + enterprise management department + + + + 财务部 + Departmental private role + accounting department + + + + 财务部经理 + Departmental private role + accounting department + + + + 财务部副经理 + Departmental private role + accounting department + + + + 会计 + Departmental private role + accounting department + + + + 出纳 + Departmental private role + accounting department + + + + 办公室 + Departmental private role + administration office + + + + 主任 + Departmental private role + administration office + + + + 办公室副主任 + Departmental private role + administration office + + + + 公文管理员 + Departmental private role + administration office + + + + 厨卫人员 + Departmental private role + administration office + + + + 办公库管 + Departmental private role + administration office + + + + 子企业人员 + Departmental private role + administration office + + + + 信息发布员 + Departmental private role + administration office + + + + 交通安全员 + System global role + + + + 外派 + Departmental private role + expatriate + + + + \ No newline at end of file diff --git a/yuthon_hr_employee/models/yuthon_user_role.py b/yuthon_hr_employee/models/yuthon_user_role.py index 0f68ec188..92cda2235 100644 --- a/yuthon_hr_employee/models/yuthon_user_role.py +++ b/yuthon_hr_employee/models/yuthon_user_role.py @@ -6,4 +6,20 @@ class YuthonUserRole(models.Model): _name = 'yuthon.user.role' name = fields.Char(string="角色名称") - + user_type = fields.Selection([("OA administrator", "OA管理员"), + ("System global role", "系统全局角色"), + ("Departmental private role", "部门私有角色")], string="角色类型") + Affiliated_organization_department = fields.Selection( + [("Leasing Department II (Former Property Management Department", "租务二部（原物业经营部）"), + ("Grain storage company", "粮储公司"), + ("association", "协会"), + ("Risk Control Audit Department", "风控审计部"), + ("Capital Operations Department", "资本运营部"), + ("Investment development department", "投资发展部"), + ("Party and Mass Human Resources Department", "党群人力资源部"), + ("enterprise management department", "企业管理部"), + ("accounting department", "财务部"), + ("administration office", "办公室"), + ("expatriate", "外派")],string = "所属机构部门") + create_time = fields.Datetime(string="创建时间", default=fields.Datetime.now) + end_time = fields.Datetime(string="结束时间") From 8afc8a5cf934f7b5dae7afe88fb9fc1c68d78f24 Mon Sep 17 00:00:00 2001 From: ONION <2275333053@qq.com> Date: Sat, 4 May 2024 18:43:37 +0800 Subject: [PATCH 8/9] =?UTF-8?q?OA=E8=A7=92=E8=89=B2,OA=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_hr_employee/__manifest__.py | 4 +- .../data/hr_department_data.xml | 127 ++++++++++ .../user_role_data.xml} | 220 +++++++++--------- yuthon_hr_employee/models/__init__.py | 1 + .../models/yuthon_hr_department.py | 15 ++ yuthon_hr_employee/models/yuthon_user_role.py | 29 ++- .../views/yuthon_hr_department_views.xml | 20 ++ .../views/yuthon_user_role_views.xml | 24 +- 8 files changed, 304 insertions(+), 136 deletions(-) create mode 100644 yuthon_hr_employee/data/hr_department_data.xml rename yuthon_hr_employee/{date/user_role_date.xml => data/user_role_data.xml} (52%) create mode 100644 yuthon_hr_employee/models/yuthon_hr_department.py create mode 100644 yuthon_hr_employee/views/yuthon_hr_department_views.xml diff --git a/yuthon_hr_employee/__manifest__.py b/yuthon_hr_employee/__manifest__.py index 401fb3e40..a111a18d1 100644 --- a/yuthon_hr_employee/__manifest__.py +++ b/yuthon_hr_employee/__manifest__.py @@ -13,9 +13,11 @@ 'website': 'https://www.pengyuthon.com', 'depends': ['hr'], 'data': [ - 'date/user_role_date.xml', + 'data/hr_department_data.xml', + 'data/user_role_data.xml', 'security/ir.model.access.csv', 'views/yuthon_hr_employee_views.xml', + 'views/yuthon_hr_department_views.xml', 'views/yuthon_job_lv_views.xml', 'views/yuthon_user_role_views.xml', ], diff --git a/yuthon_hr_employee/data/hr_department_data.xml b/yuthon_hr_employee/data/hr_department_data.xml new file mode 100644 index 000000000..fa22a6437 --- /dev/null +++ b/yuthon_hr_employee/data/hr_department_data.xml @@ -0,0 +1,127 @@ + + + + 天河投资 + False + False + + + + 新兴协会 + 广州市天河区龙口西路90号天成大厦3楼东侧 + True + False + + + + 科创中心 + 广州市天河区龙口西路90号天成大厦4楼东侧 + True + False + + + + 管理员 + 广州市天河区龙口西路90号天成大厦5楼东侧 + False + False + + + + 外派 + 广州市天河区龙口西路90号天成大厦6楼东侧 + False + False + + + + 粮储公司 + 广州市天河区龙口西路90号天成大厦7楼东侧 + False + False + + + + 商业总公司 + 广州市天河区龙口西路90号天成大厦8楼东侧 + False + False + + + + 领导班子 + 广州市天河区龙口西路90号天成大厦9楼东侧 + False + False + + + + 财务部 + 广州市天河区龙口西路90号天成大厦10楼东侧 + False + False + + + + 办公室 + 广州市天河区龙口西路90号天成大厦11楼东侧 + False + False + + + + 企业管理部 + 广州市天河区龙口西路90号天成大厦12楼东侧 + False + False + + + + 租务二部(原物业经营部) + 广州市天河区龙口西路90号天成大厦13楼东侧 + False + False + + + + 资本运营部 + 广州市天河区龙口西路90号天成大厦14楼东侧 + False + False + + + + 投资发展部 + 广州市天河区龙口西路90号天成大厦15楼东侧 + False + False + + + + 党群人力资源部 + 广州市天河区龙口西路90号天成大厦16楼东侧 + False + False + + + + 风控审计部 + 广州市天河区龙口西路90号天成大厦17楼东侧 + False + False + + + + 人事部 + 广州市天河区龙口西路90号天成大厦18楼东侧 + False + False + + + + 厨位人员 + 广州市天河区龙口西路90号天成大厦19楼东侧 + False + False + + \ No newline at end of file diff --git a/yuthon_hr_employee/date/user_role_date.xml b/yuthon_hr_employee/data/user_role_data.xml similarity index 52% rename from yuthon_hr_employee/date/user_role_date.xml rename to yuthon_hr_employee/data/user_role_data.xml index 4b28b6f68..7ad3af9d0 100644 --- a/yuthon_hr_employee/date/user_role_date.xml +++ b/yuthon_hr_employee/data/user_role_data.xml @@ -2,397 +2,397 @@ 普通员工 - System global role + system_global_user 常务副秘书长 - Departmental private role - association + departmental_role + association 总经理 - System global role + system_global_user 理事长 - System global role + system_global_user 常务副会长 - System global role + system_global_user 副总经理 - System global role + system_global_user 监事会主席 - System global role + system_global_user 秘书处办公室主任 - System global role + system_global_user 分管领导 - System global role + system_global_user 部门副经理 - System global role + system_global_user 秘书处办公室副主任 - System global role + system_global_user 部门经理 - System global role + system_global_user 各企业班子（发文） - System global role + system_global_user 试用期员工 - System global role + system_global_user 物业部副总经理 - Departmental private role - Leasing Department II (Former Property Management Department + departmental_role + rent2 理事会成员 - System global role + system_global_user 安全办成员 - System global role + system_global_user 实习 - System global role + system_global_user 副院长 - System global role + system_global_user 院长 - System global role + system_global_user 党员 - System global role + system_global_user 科创中心 - System global role + system_global_user 需考勤人员 - System global role + system_global_user 财务(物业) - System global role + system_global_user 集团安委会 - System global role - + system_global_user 天投城建安全办 - System global role + system_global_user 集团安全办 - System global role + system_global_user 天投城建安委会 - System global role + system_global_user 天投城建安委会 - System global role + system_global_user 公司领导 - System global role + system_global_user 领导班子 - System global role + system_global_user 董事长 - System global role + system_global_user 执行董事 - Departmental private role - Grain storage company - + departmental_role + storage_company 秘书长 - Departmental private role - association + departmental_role + association + 副主任 - System global role + system_global_user 工会委员 - System global role + system_global_user 风控审计经理 - Departmental private role - Risk Control Audit Department + departmental_role + risk_department 风控管理岗 - Departmental private role - Risk Control Audit Department + departmental_role + risk_department 系统管理员 - OA administrator + oa_admin 安全办副主任 - System global role + system_global_user 投融资部经理 - Departmental private role - Capital Operations Department + departmental_role + capital_department 投融资部副总经理 - Departmental private role - Capital Operations Department + departmental_role + capital_department + 投融资部副经理 - Departmental private role - Capital Operations Department + departmental_role + capital_department 投融资发展部 - Departmental private role - Capital Operations Department + departmental_role + capital_department 项目开发部 - Departmental private role - Investment development department + departmental_role + investment_department 项目部经理 - Departmental private role - Investment development department - + departmental_role + investment_department 人事专员 - Departmental private role - Party and Mass Human Resources Department + departmental_role + party_department 党建专员 - Departmental private role - Party and Mass Human Resources Department + departmental_role + party_department 人事管理员 - Departmental private role - Party and Mass Human Resources Department + departmental_role + party_department 人事主管 - Departmental private role - Party and Mass Human Resources Department + departmental_role + party_department 物业部 - Departmental private role - Leasing Department II (Former Property Management Department + departmental_role + rent2 物业部经理 - Departmental private role - Leasing Department II (Former Property Management Department + departmental_role + rent2 物业部副经理 - Departmental private role - Leasing Department II (Former Property Management Department + departmental_role + rent2 工程主管 - Departmental private role - Leasing Department II (Former Property Management Department + departmental_role + rent2 企业管理部 - Departmental private role - enterprise management department + departmental_role + enterprise_department 企业管理部经理 - Departmental private role - enterprise management department + departmental_role + enterprise_department 财务部 - Departmental private role - accounting department + departmental_role + accounting_department 财务部经理 - Departmental private role - accounting department + departmental_role + accounting_department 财务部副经理 - Departmental private role - accounting department + departmental_role + accounting_department 会计 - Departmental private role - accounting department + departmental_role + accounting_department 出纳 - Departmental private role - accounting department + departmental_role + accounting_department 办公室 - Departmental private role - administration office + departmental_role + office 主任 - Departmental private role - administration office + departmental_role + office 办公室副主任 - Departmental private role - administration office + departmental_role + office 公文管理员 - Departmental private role - administration office + departmental_role + office 厨卫人员 - Departmental private role - administration office + departmental_role + office 办公库管 - Departmental private role - administration office + departmental_role + office 子企业人员 - Departmental private role - administration office + departmental_role + office 信息发布员 - Departmental private role - administration office + departmental_role + office 交通安全员 - System global role + system_global_user + 外派 - Departmental private role - expatriate + departmental_role + expatriate diff --git a/yuthon_hr_employee/models/__init__.py b/yuthon_hr_employee/models/__init__.py index 6a8a4dc2b..e5f40cb28 100644 --- a/yuthon_hr_employee/models/__init__.py +++ b/yuthon_hr_employee/models/__init__.py @@ -1,3 +1,4 @@ from . import yuthon_hr_employee from . import yuthon_job_lv from . import yuthon_user_role +from . import yuthon_hr_department diff --git a/yuthon_hr_employee/models/yuthon_hr_department.py b/yuthon_hr_employee/models/yuthon_hr_department.py new file mode 100644 index 000000000..49e40e4fc --- /dev/null +++ b/yuthon_hr_employee/models/yuthon_hr_department.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, _ + + +class YuthonHrDepartment(models.Model): + _inherit = "hr.department" + + department_phone = fields.Char(string="部门电话") + department_fax = fields.Char(string="部门传真") + department_location = fields.Char(string="部门地址") + department_function = fields.Char(string="部门职能") + is_institution = fields.Boolean(string="是否机构") + is_global_department = fields.Boolean(string="是否全局部门") + create_time = fields.Datetime(string="创建时间", default=fields.Datetime.now) + end_time = fields.Datetime(string="结束时间") diff --git a/yuthon_hr_employee/models/yuthon_user_role.py b/yuthon_hr_employee/models/yuthon_user_role.py index 92cda2235..87dcf3822 100644 --- a/yuthon_hr_employee/models/yuthon_user_role.py +++ b/yuthon_hr_employee/models/yuthon_user_role.py @@ -6,20 +6,19 @@ class YuthonUserRole(models.Model): _name = 'yuthon.user.role' name = fields.Char(string="角色名称") - user_type = fields.Selection([("OA administrator", "OA管理员"), - ("System global role", "系统全局角色"), - ("Departmental private role", "部门私有角色")], string="角色类型") - Affiliated_organization_department = fields.Selection( - [("Leasing Department II (Former Property Management Department", "租务二部（原物业经营部）"), - ("Grain storage company", "粮储公司"), - ("association", "协会"), - ("Risk Control Audit Department", "风控审计部"), - ("Capital Operations Department", "资本运营部"), - ("Investment development department", "投资发展部"), - ("Party and Mass Human Resources Department", "党群人力资源部"), - ("enterprise management department", "企业管理部"), - ("accounting department", "财务部"), - ("administration office", "办公室"), - ("expatriate", "外派")],string = "所属机构部门") + user_type = fields.Selection([("oa_admin", "OA管理员"), + ("system_global_user", "系统全局角色"), + ("departmental_role", "部门私有角色")], string="角色类型") + organ_department = fields.Selection([("rent2", "租务二部(原物业经营部)"), + ("storage_company", "粮储公司"), + ("association", "协会"), + ("risk_department", "风控审计部"), + ("capital_department", "资本运营部"), + ("investment_department", "投资发展部"), + ("party_department", "党群人力资源部"), + ("enterprise_department", "企业管理部"), + ("accounting_department", "财务部"), + ("office", "办公室"), + ("expatriate", "外派")], string="所属机构部门") create_time = fields.Datetime(string="创建时间", default=fields.Datetime.now) end_time = fields.Datetime(string="结束时间") diff --git a/yuthon_hr_employee/views/yuthon_hr_department_views.xml b/yuthon_hr_employee/views/yuthon_hr_department_views.xml new file mode 100644 index 000000000..ade7f7053 --- /dev/null +++ b/yuthon_hr_employee/views/yuthon_hr_department_views.xml @@ -0,0 +1,20 @@ + + + + yuthon.hr.department.inherit + hr.department + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/yuthon_hr_employee/views/yuthon_user_role_views.xml b/yuthon_hr_employee/views/yuthon_user_role_views.xml index 8274198e9..b72246b90 100644 --- a/yuthon_hr_employee/views/yuthon_user_role_views.xml +++ b/yuthon_hr_employee/views/yuthon_user_role_views.xml @@ -1,26 +1,30 @@ - - yuthon.job.lv.tree - yuthon.job.lv + + yuthon.user.role.tree + yuthon.user.role + + + + - - 职级配置 - yuthon.job.lv + + 角色配置 + yuthon.user.role tree,form + sequence="6"/> \ No newline at end of file From f6424f03d17a81ad21300f972c6453404c879a81 Mon Sep 17 00:00:00 2001 From: pengyuthon Date: Sat, 4 May 2024 22:42:48 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E9=83=A8=E9=97=A8-=E4=B8=8A=E7=BA=A7?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_hr_employee/data/hr_department_data.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/yuthon_hr_employee/data/hr_department_data.xml b/yuthon_hr_employee/data/hr_department_data.xml index fa22a6437..1935d5e05 100644 --- a/yuthon_hr_employee/data/hr_department_data.xml +++ b/yuthon_hr_employee/data/hr_department_data.xml @@ -53,6 +53,7 @@ 广州市天河区龙口西路90号天成大厦9楼东侧 False False + @@ -60,6 +61,7 @@ 广州市天河区龙口西路90号天成大厦10楼东侧 False False + @@ -67,6 +69,7 @@ 广州市天河区龙口西路90号天成大厦11楼东侧 False False + @@ -74,6 +77,7 @@ 广州市天河区龙口西路90号天成大厦12楼东侧 False False + @@ -81,6 +85,7 @@ 广州市天河区龙口西路90号天成大厦13楼东侧 False False + @@ -88,6 +93,7 @@ 广州市天河区龙口西路90号天成大厦14楼东侧 False False + @@ -95,6 +101,7 @@ 广州市天河区龙口西路90号天成大厦15楼东侧 False False + @@ -102,6 +109,7 @@ 广州市天河区龙口西路90号天成大厦16楼东侧 False False + @@ -109,6 +117,7 @@ 广州市天河区龙口西路90号天成大厦17楼东侧 False False + @@ -116,6 +125,7 @@ 广州市天河区龙口西路90号天成大厦18楼东侧 False False + @@ -123,5 +133,6 @@ 广州市天河区龙口西路90号天成大厦19楼东侧 False False + \ No newline at end of file