pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dev_hong

Browse Source 
# Conflicts:
#	yuthon_hr_employee/data/hr_department_data.xml
This commit is contained in:
ONION
2024-05-04 22:56:18 +08:00
parent eb2b80eb17 b24d980ab2
commit 2a72b5f304
9 changed files with 288 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_employee/data/hr_department_data.xml
+44
View File
@@ -53,6 +53,10 @@
<field name="department_location">广州市天河区龙口西路90号天成大厦9楼东侧</field>
<field name="is_institution">False</field>
<field name="is_global_department">False</field>
<<<<<<< HEAD
=======
<field name="parent_id" ref="hr_department_thtz"/>
>>>>>>> origin/master
</record>
<record id="hr_department_cwb" model="hr.department">
@@ -60,6 +64,10 @@
<field name="department_location">广州市天河区龙口西路90号天成大厦10楼东侧</field>
<field name="is_institution">False</field>
<field name="is_global_department">False</field>
<<<<<<< HEAD
=======
<field name="parent_id" ref="hr_department_thtz"/>
>>>>>>> origin/master
</record>
<record id="hr_department_bgs" model="hr.department">
@@ -67,6 +75,10 @@
<field name="department_location">广州市天河区龙口西路90号天成大厦11楼东侧</field>
<field name="is_institution">False</field>
<field name="is_global_department">False</field>
<<<<<<< HEAD
=======
<field name="parent_id" ref="hr_department_thtz"/>
>>>>>>> origin/master
</record>
<record id="hr_department_qyglb" model="hr.department">
@@ -74,6 +86,10 @@
<field name="department_location">广州市天河区龙口西路90号天成大厦12楼东侧</field>
<field name="is_institution">False</field>
<field name="is_global_department">False</field>
<<<<<<< HEAD
=======
<field name="parent_id" ref="hr_department_thtz"/>
>>>>>>> origin/master
</record>
<record id="hr_department_zweb" model="hr.department">
@@ -81,6 +97,10 @@
<field name="department_location">广州市天河区龙口西路90号天成大厦13楼东侧</field>
<field name="is_institution">False</field>
<field name="is_global_department">False</field>
<<<<<<< HEAD
=======
<field name="parent_id" ref="hr_department_thtz"/>
>>>>>>> origin/master
</record>
<record id="hr_department_zbyyb" model="hr.department">
@@ -88,6 +108,10 @@
<field name="department_location">广州市天河区龙口西路90号天成大厦14楼东侧</field>
<field name="is_institution">False</field>
<field name="is_global_department">False</field>
<<<<<<< HEAD
=======
<field name="parent_id" ref="hr_department_thtz"/>
>>>>>>> origin/master
</record>
<record id="hr_department_tzfzb" model="hr.department">
@@ -95,6 +119,10 @@
<field name="department_location">广州市天河区龙口西路90号天成大厦15楼东侧</field>
<field name="is_institution">False</field>
<field name="is_global_department">False</field>
<<<<<<< HEAD
=======
<field name="parent_id" ref="hr_department_thtz"/>
>>>>>>> origin/master
</record>
<record id="hr_department_tzfzb" model="hr.department">
@@ -102,6 +130,10 @@
<field name="department_location">广州市天河区龙口西路90号天成大厦16楼东侧</field>
<field name="is_institution">False</field>
<field name="is_global_department">False</field>
<<<<<<< HEAD
=======
<field name="parent_id" ref="hr_department_thtz"/>
>>>>>>> origin/master
</record>
<record id="hr_department_tzfzb" model="hr.department">
@@ -109,6 +141,10 @@
<field name="department_location">广州市天河区龙口西路90号天成大厦17楼东侧</field>
<field name="is_institution">False</field>
<field name="is_global_department">False</field>
<<<<<<< HEAD
=======
<field name="parent_id" ref="hr_department_thtz"/>
>>>>>>> origin/master
</record>
<record id="hr_department_tzfzb" model="hr.department">
@@ -116,6 +152,10 @@
<field name="department_location">广州市天河区龙口西路90号天成大厦18楼东侧</field>
<field name="is_institution">False</field>
<field name="is_global_department">False</field>
<<<<<<< HEAD
=======
<field name="parent_id" ref="hr_department_bgs"/>
>>>>>>> origin/master
</record>
<record id="hr_department_tzfzb" model="hr.department">
@@ -123,5 +163,9 @@
<field name="department_location">广州市天河区龙口西路90号天成大厦19楼东侧</field>
<field name="is_institution">False</field>
<field name="is_global_department">False</field>
<<<<<<< HEAD
=======
<field name="parent_id" ref="hr_department_bgs"/>
>>>>>>> origin/master
</record>
</odoo>
yuthon_hr_employee/models/yuthon_hr_employee.py
+45
View File
@@ -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
yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+31 -12
View File
@@ -24,16 +24,20 @@
<field name="private_street" placeholder="Street..." class="o_address_street"/>
<field name="private_street2" placeholder="Street 2..." class="o_address_street"/>
<field name="private_city" placeholder="City" class="o_address_city"/>
<field name="private_state_id" class="o_address_state" placeholder="State" options="{'no_open': True, 'no_quick_create': True}" context="{'default_country_id': private_country_id}"/>
<field name="private_state_id" class="o_address_state" placeholder="State"
options="{'no_open': True, 'no_quick_create': True}"
context="{'default_country_id': private_country_id}"/>
<field name="private_zip" placeholder="ZIP" class="o_address_zip"/>
<field name="private_country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/>
<field name="private_country_id" placeholder="Country" class="o_address_country"
options='{"no_open": True, "no_create": True}'/>
</div>
<field name="private_email" string="邮箱"/>
<field name="private_phone" string="电话"/>
<!-- 增加两个字段 -->
<field name="user_salary"/>
<field name="job_lv_salary"/>
<field name="bank_account_id" context="{'default_partner_id': work_contact_id}" options="{'no_quick_create': True}" readonly="not id"/>
<field name="bank_account_id" context="{'default_partner_id': work_contact_id}"
options="{'no_quick_create': True}" readonly="not id"/>
<field name="entry_time"/>
<field name="confirmation_time"/>
<field name="company_old"/>
@@ -106,18 +110,20 @@
</xpath>
<xpath expr="//group[@name='active_group']" position="after">
<group string="工作信息">
<field name="new_start_contract_data"/>
<field name="new_end_contract_data"/>
<field name="open_start_time"/>
<field name="open_start_time_today"/>
<field name="interrupt_work_month"/>
<field name="cumulative_work_month"/>
<field name="cumulative_work_years"/>
</group>
<field name="new_start_contract_data"/>
<field name="new_end_contract_data"/>
<field name="open_start_time"/>
<field name="open_start_time_today"/>
<field name="social_insurance_date"/>
<field name="social_insurance_time"/>
<field name="interrupt_work_month"/>
<field name="cumulative_work_month"/>
<field name="cumulative_work_years"/>
</group>
<group string="其他">
<field name="archiving_agency"/>
<field name="over_data_time"/>
</group>
</group>
</xpath>
<xpath expr="//page[@name='public']//group[@name='departure']" position="after">
<group name="overtime" string="加班">
@@ -131,9 +137,22 @@
<group name="holiday" string="假期">
<field name="user_year_holiday_hours"/>
<field name="remainder_year_holiday_hours"/>
<field name="cumulative_remainder_visit_hours"/>
<field name="all_year_holiday_hours"/>
</group>
</xpath>
<xpath expr="//page[@name='personal_information']" position="after">
<page string="其他信息">
<group>
<group>
<field name="employment_registration"/>
</group>
<group>
<field name="seniority_prize_pick_up_status"/>
</group>
</group>
</page>
</xpath>
</field>
</record>
</odoo>
yuthon_menuitem/__init__.py
+1 -1
View File
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
from . import models
yuthon_menuitem/i18n/zh_CN.po
+77 -22
View File
@@ -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 "流程中心"
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 "门户网站"
yuthon_menuitem/models/__init__.py
-1
View File
@@ -1 +0,0 @@
from . import base
yuthon_menuitem/models/base.py
-7
View File
@@ -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)
yuthon_menuitem/views/menuitem_sequence.xml
+89 -11
View File
@@ -1,18 +1,96 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<!-- Menus -->
<menuitem id="project.menu_main_pm" name="项目管理" sequence="2"/>
<menuitem id="approvals.approvals_menu_root" name="流程中心" sequence="3"/>
<menuitem id="hr.menu_hr_root" name="人力资源" sequence="5"/>
<menuitem id="documents.menu_root" name="文档管理" sequence="6"/>
<menuitem id="sale_renting.rental_menu_root" name="物业系统" sequence="7"/>
<record id="project.menu_main_pm" model="ir.ui.menu">
<field name="name">项目管理</field>
<field name="sequence">2</field>
</record>
<menuitem id="room.room_menu_root" name="会议管理" sequence="8"/>
<menuitem id="purchase.menu_purchase_root" name="办公用品管理" sequence="9"/>
<menuitem id="account_asset.menu_action_account_asset_form" sequence="10" name="固定资产管理"/>
<menuitem id="fleet.menu_root" name="车辆管理" sequence="11"/>
<menuitem id="website_slides.website_slides_menu_root" name="培训学习" sequence="12"/>
<menuitem id="website.menu_website_configuration" name="门户网站" sequence="13"/>
<record id="approvals.approvals_menu_root" model="ir.ui.menu">
<field name="name">流程中心</field>
<field name="sequence">3</field>
</record>
<record id="hr.menu_hr_root" model="ir.ui.menu">
<field name="name">人力资源</field>
<field name="sequence">5</field>
</record>
<record id="documents.menu_root" model="ir.ui.menu">
<field name="name">文档管理</field>
<field name="sequence">6</field>
</record>
<record id="sale_renting.rental_menu_root" model="ir.ui.menu">
<field name="name">物业系统</field>
<field name="sequence">7</field>
</record>
<record id="room.room_menu_root" model="ir.ui.menu">
<field name="name">会议管理</field>
<field name="sequence">8</field>
</record>
<record id="purchase.menu_purchase_root" model="ir.ui.menu">
<field name="name">办公用品管理</field>
<field name="sequence">9</field>
</record>
<!-- <record id="account_asset.menu_action_account_asset_form" model="ir.ui.menu">-->
<!-- <field name="name">固定资产管理</field>-->
<!-- <field name="sequence">10</field>-->
<!-- <field name="parent_id">''</field>-->
<!-- </record>-->
<record id="fleet.menu_root" model="ir.ui.menu">
<field name="name">车辆管理</field>
<field name="sequence">11</field>
</record>
<record id="website_slides.website_slides_menu_root" model="ir.ui.menu">
<field name="name">培训学习</field>
<field name="sequence">12</field>
</record>
<record id="website.menu_website_configuration" model="ir.ui.menu">
<field name="name">门户网站</field>
<field name="sequence">13</field>
</record>
<record id="mail.menu_root_discuss" model="ir.ui.menu">
<field name="name">讨论</field>
<field name="sequence">14</field>
</record>
<record id="mail.menu_root_discuss" model="ir.ui.menu">
<field name="name">讨论</field>
<field name="sequence">14</field>
</record>
<record id="project_todo.menu_todo_todos" model="ir.ui.menu">
<field name="name">代办</field>
<field name="sequence">15</field>
</record>
<record id="calendar.mail_menu_calendar" model="ir.ui.menu">
<field name="name">日历</field>
<field name="sequence">16</field>
</record>
<!-- <menuitem id="project.menu_main_pm" name="项目管理" sequence="2"/>-->
<!-- <menuitem id="approvals.approvals_menu_root" name="流程中心" sequence="3"/>-->
<!-- <menuitem id="hr.menu_hr_root" name="人力资源" sequence="5"/>-->
<!-- <menuitem id="documents.menu_root" name="文档管理" sequence="6"/>-->
<!-- <menuitem id="sale_renting.rental_menu_root" name="物业系统" sequence="7"/>-->
<!-- <menuitem id="room.room_menu_root" name="会议管理" sequence="8"/>-->
<!-- <menuitem id="purchase.menu_purchase_root" name="办公用品管理" sequence="9"/>-->
<!-- <menuitem id="account_asset.menu_action_account_asset_form" sequence="10" name="固定资产管理"/>-->
<!-- <menuitem id="fleet.menu_root" name="车辆管理" sequence="11"/>-->
<!-- <menuitem id="website_slides.website_slides_menu_root" name="培训学习" sequence="12"/>-->
<!-- <menuitem id="website.menu_website_configuration" name="门户网站" sequence="13"/>-->
<!-- <menuitem id="sale_renting.rental_order_menu" name="承租信息"/>-->
<!-- <menuitem id="sale_renting.menu_rental_products" name="物业资产"/>-->
yuthon_required_mark/__manifest__.py
+1 -1
View File
@@ -11,7 +11,7 @@
'category': 'Tools',
'version': '0.1',
'depends': ['base', 'web', 'yuthon_announcement'],
'depends': ['base', 'web'],
'assets': {
'web.assets_backend': [