diff --git a/yuthon_hr_employee/data/hr_department_data.xml b/yuthon_hr_employee/data/hr_department_data.xml index fa22a6437..a828cd02b 100644 --- a/yuthon_hr_employee/data/hr_department_data.xml +++ b/yuthon_hr_employee/data/hr_department_data.xml @@ -53,6 +53,10 @@ 广州市天河区龙口西路90号天成大厦9楼东侧 False False +<<<<<<< HEAD +======= + +>>>>>>> origin/master @@ -60,6 +64,10 @@ 广州市天河区龙口西路90号天成大厦10楼东侧 False False +<<<<<<< HEAD +======= + +>>>>>>> origin/master @@ -67,6 +75,10 @@ 广州市天河区龙口西路90号天成大厦11楼东侧 False False +<<<<<<< HEAD +======= + +>>>>>>> origin/master @@ -74,6 +86,10 @@ 广州市天河区龙口西路90号天成大厦12楼东侧 False False +<<<<<<< HEAD +======= + +>>>>>>> origin/master @@ -81,6 +97,10 @@ 广州市天河区龙口西路90号天成大厦13楼东侧 False False +<<<<<<< HEAD +======= + +>>>>>>> origin/master @@ -88,6 +108,10 @@ 广州市天河区龙口西路90号天成大厦14楼东侧 False False +<<<<<<< HEAD +======= + +>>>>>>> origin/master @@ -95,6 +119,10 @@ 广州市天河区龙口西路90号天成大厦15楼东侧 False False +<<<<<<< HEAD +======= + +>>>>>>> origin/master @@ -102,6 +130,10 @@ 广州市天河区龙口西路90号天成大厦16楼东侧 False False +<<<<<<< HEAD +======= + +>>>>>>> origin/master @@ -109,6 +141,10 @@ 广州市天河区龙口西路90号天成大厦17楼东侧 False False +<<<<<<< HEAD +======= + +>>>>>>> origin/master @@ -116,6 +152,10 @@ 广州市天河区龙口西路90号天成大厦18楼东侧 False False +<<<<<<< HEAD +======= + +>>>>>>> origin/master @@ -123,5 +163,9 @@ 广州市天河区龙口西路90号天成大厦19楼东侧 False False +<<<<<<< HEAD +======= + +>>>>>>> origin/master \ No newline at end of file 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 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 + 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..eaf693774 100644 --- a/yuthon_menuitem/views/menuitem_sequence.xml +++ b/yuthon_menuitem/views/menuitem_sequence.xml @@ -1,18 +1,96 @@ - - - - - + + 项目管理 + 2 + - - - - - - + + 流程中心 + 3 + + + + 人力资源 + 5 + + + + 文档管理 + 6 + + + + 物业系统 + 7 + + + + 会议管理 + 8 + + + + 办公用品管理 + 9 + + + + + + + + + + 车辆管理 + 11 + + + + 培训学习 + 12 + + + + 门户网站 + 13 + + + + 讨论 + 14 + + + + 讨论 + 14 + + + + 代办 + 15 + + + + 日历 + 16 + + + + + + + + + + + + + + + + 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': [