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

添加功能

Browse Source
This commit is contained in:
李鹏宇
2026-04-20 18:36:13 +08:00
parent 240cf68086
commit 694384e8b1
8 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_catering/models/yuthon_catering.py
+1 -1
View File
@@ -7,7 +7,7 @@ class YuthonCatering(models.Model):
_name = 'yuthon.catering'
date = fields.Date(string='日期', required=True)
employee_number = fields.Char(string='序号', related='employee_id.user_number', store=True)
employee_number = fields.Char(string='序号', related='employee_id.number', store=True)
week_day = fields.Char(string='星期', compute='_compute_week_day', store=True)
dept_id = fields.Many2one(string='部门', comodel_name='hr.department', related='employee_id.department_id', store=True)
employee_id = fields.Many2one(string='员工', comodel_name='hr.employee', required=True)
yuthon_hr_attendance/models/yuthon_holiday_statement.py
+1 -1
View File
@@ -13,7 +13,7 @@ class InheritHrLeave(models.Model):
_description = '请假情况'
caption = fields.Char(string="标题", compute="_compute_application_reason")
employee_number = fields.Char(string='序号', related='employee_id.user_number', store=True)
employee_number = fields.Char(string='序号', related='employee_id.number', store=True)
employee_id = fields.Many2one('hr.employee', string="发起人")
mobile_phone = fields.Char(related='employee_id.mobile_phone', string="手机号")
entry_date = fields.Date(related='employee_id.entry_date', string="入职时间", store=True)
yuthon_hr_attendance/models/yuthon_meal_line.py
+1 -1
View File
@@ -10,7 +10,7 @@ class YuthonMealLine(models.Model):
_description = '误餐明细'
employee_id = fields.Many2one('hr.employee', string="员工")
employee_number = fields.Char(string='序号', related='employee_id.user_number', store=True)
employee_number = fields.Char(string='序号', related='employee_id.number', store=True)
meal_name = fields.Char(string='标题')
meal_id = fields.Many2one('vacation.meal.line', string="关联误餐额度记录")
entry_date = fields.Date(related='employee_id.entry_date', string="入职时间", store=True)
yuthon_hr_attendance/models/yuthon_overtime_line.py
+1 -1
View File
@@ -11,7 +11,7 @@ class YuthonOvertimeLine(models.Model):
employee_id = fields.Many2one('hr.employee', string="员工")
entry_date = fields.Date(related='employee_id.entry_date', string="入职时间", store=True)
employee_number = fields.Char(string='序号', related='employee_id.user_number', store=True)
employee_number = fields.Char(string='序号', related='employee_id.number', store=True)
select_month = fields.Selection([('1', '一月'), ('2', '二月'), ('3', '三月'), ('4', '四月'),
('5', '五月'), ('6', '六月'), ('7', '七月'), ('8', '八月'),
('9', '九月'), ('10', '十月'), ('11', '十一月'),
yuthon_hr_attendance/models/yuthon_vacation_reports.py
+3 -3
View File
@@ -21,7 +21,7 @@ class YuthonVacationReports(models.Model):
month_id = fields.Many2one('base.month', string='月份', compute="_compute_display_date", store=True)
year_id = fields.Many2one('base.year', string='年份', compute="_compute_display_date", store=True)
employee_id = fields.Many2one('hr.employee', string='员工')
employee_number = fields.Char(string='序号', related='employee_id.user_number', store=True, readonly=True)
employee_number = fields.Char(string='序号', related='employee_id.number', store=True, readonly=True)
entry_date = fields.Date(related='employee_id.entry_date', string="入职时间", store=True)
number_card = fields.Integer(string='补卡次数', compute="_compute_number_card")
remaining_number_card = fields.Integer(string='剩余补卡次数', default=3, compute="_compute_number_card", store=True)
@@ -2511,7 +2511,7 @@ class VacationOverline(models.Model):
default=lambda self: str(datetime.now().year))
vacation_id = fields.Many2one('yuthon.vacation.reports', string='关联假期额度记录')
employee_id = fields.Many2one('hr.employee', string='员工', compute='_compute_employee_id', store=True)
employee_number = fields.Char(string='序号', related='employee_id.user_number', store=True)
employee_number = fields.Char(string='序号', related='employee_id.number', store=True)
entry_date = fields.Date(related='employee_id.entry_date', string="入职时间", store=True)
department_id = fields.Many2one('hr.department', related='employee_id.department_id', string="部门")
company_id = fields.Many2one('res.company', related='employee_id.company_id', string="公司")
@@ -2874,7 +2874,7 @@ class VacationMealLine(models.Model):
vacation_id = fields.Many2one('yuthon.vacation.reports', string='关联假期额度记录')
is_filing = fields.Boolean(string="归档")
employee_number = fields.Char(string='序号', related='employee_id.user_number', store=True)
employee_number = fields.Char(string='序号', related='employee_id.number', store=True)
employee_id = fields.Many2one('hr.employee', string='员工', compute='_compute_employee_id', store=True)
entry_date = fields.Date(related='employee_id.entry_date', string="入职时间", store=True)
department_id = fields.Many2one('hr.department', related='employee_id.department_id', string="部门", store=True)
yuthon_hr_employee/models/yuthon_medical_manage.py
+1 -1
View File
@@ -9,7 +9,7 @@ class YuthonMedicalManage(models.Model):
_description = '体检费管理'
employee_id = fields.Many2one('hr.employee', string="员工姓名")
employee_number = fields.Char( string='序号', related='employee_id.user_number', store=True, readonly=True)
employee_number = fields.Char( string='序号', related='employee_id.number', store=True, readonly=True)
start_date = fields.Date(string='开始日期')
year = fields.Char(string="年份")
current_year_remaining = fields.Float(string="本年剩余", compute="_compute_current_year_remaining")
yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+4 -4
View File
@@ -221,8 +221,8 @@
<attribute name="options">"{'no_create': True, 'no_open': True}"</attribute>
</xpath>
<xpath expr="//field[@name='job_id']" position="after">
<field name="number" invisible="1"/>
<field name="user_number"/>
<field name="number"/>
<field name="user_number" invisible="1"/>
<field name="contract_type_id" options="{'no_open': True}"/>
</xpath>
<xpath expr="//field[@name='department_id']" position="attributes">
@@ -512,7 +512,7 @@
decoration-info="end_comparison == 'blue'"
decoration-danger="end_comparison == 'red'"
decoration-warning="end_comparison == 'yellow'"
default_order="user_number asc">
default_order="number asc">
<header>
</header>
<field name="end_comparison" column_invisible="1"/>
@@ -543,7 +543,7 @@
<field name="high_degree2"/>
<field name="graduate_date"/>
<field name="user_type"/>
<field name="user_number"/>
<field name="number"/>
<field name="company_id"/>
<field name="work_location_id" column_invisible="1"/>
</tree>
yuthon_salary/models/yuthon_meal_expenses.py
+1 -1
View File
@@ -8,7 +8,7 @@ class YuthonMealExpenses(models.Model):
_description = '餐费'
employee_id = fields.Many2one('hr.employee', string='姓名')
employee_number = fields.Char(string='序号', related='employee_id.user_number', store=True)
employee_number = fields.Char(string='序号', related='employee_id.number', store=True)
card = fields.Char(string='身份证')
number_breakfasts = fields.Integer(string='早餐次数', compute='_compute_catering_counts', store=True)
number_lunches = fields.Integer(string='午餐次数', compute='_compute_catering_counts', store=True)