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

!12603 !12602 按钮位置

Browse Source 
Merge pull request !12603 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-08-11 08:16:51 +00:00
committed by Gitee
parent 97675460db dbb30eb3bb
commit 04d3678b68
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
room/views/room_booking_views.xml
+9 -9
View File
@@ -128,16 +128,16 @@
<field name="model">room.booking</field>
<field name="arch" type="xml">
<form duplicate="0">
<header>
<button name="meet_notice" string="会议通知" type="object" class="oe_highlight" invisible="not work_end"/>
<button name="meeting_sign_in" string="签到" invisible="meeting_type != 'down' or not work_end " type="object"
class="oe_highlight"/>
<button name="meeting_partner_create" string="录入" invisible="meeting_type != 'down' or not work_end"
type="object" class="oe_highlight"/>
<button name="sync_wechat_room" string="同步企业微信" type="object" class="oe_highlight" invisible="not work_end"/>
<button name="action_print_room_booking_agenda" string="打印" type="object" class="btn-primary"/>
</header>
<sheet>
<header>
<button name="meet_notice" string="会议通知" type="object" class="oe_highlight" invisible="not work_end"/>
<button name="meeting_sign_in" string="签到" invisible="meeting_type != 'down' or not work_end " type="object"
class="oe_highlight"/>
<button name="meeting_partner_create" string="录入" invisible="meeting_type != 'down' or not work_end"
type="object" class="oe_highlight"/>
<button name="sync_wechat_room" string="同步企业微信" type="object" class="oe_highlight" invisible="not work_end"/>
<button name="action_print_room_booking_agenda" string="打印" type="object" class="btn-primary"/>
</header>
<group col="3">
<group>
<field name="code" string="流水号" readonly="1"/>
yuthon_hr_attendance/models/duty_adjustment_schedule.py
+2 -1
View File
@@ -60,7 +60,8 @@ class DutyAdjustmentSchedule(models.Model):
over_record = self.env['vacation.over.line'].search([
('employee_id', '=', record.employee_id.id),
('update_date', '=', record.duty_date),
('vacation_id', '=', record.vacation_id.id)
('vacation_id', '=', record.vacation_id.id),
('text', '=', '值班调休'),
], limit=1)
if not over_record:
self.env['vacation.over.line'].create({
yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
+2 -1
View File
@@ -422,7 +422,7 @@
</page>
<page string="育儿假">
<field name="parenting_line_ids" context="{'default_employee_id': employee_id}">
<tree editable="bottom" delete="false" edit="false" create="false">
<tree editable="bottom" edit="false" create="false" delete="false">
<field name="employee_id" column_invisible="1"/>
<field name="vacation_id" column_invisible="1"/>
<field name="update_date"/>
@@ -430,6 +430,7 @@
<field name="lines"/>
<field name="text"/>
<field name="is_confirm" column_invisible="1"/>
<button name="unlink" string="删除" type="object" class="btn-primary" groups="yuthon_holiday.group_yuthon_holiday_admin"/>
</tree>
</field>
</page>