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

!8477 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang

Browse Source 
Merge pull request !8477 from 李鹏宇/dev_wang
This commit is contained in:
李鹏宇
2026-01-30 09:41:15 +00:00
committed by Gitee
parent e5c116a758 07017cd990
commit d08b6e1d29
7 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
room/models/room_booking.py
+1 -1
View File
@@ -55,7 +55,7 @@ class RoomBooking(models.Model):
room_users_names = fields.Char(string="出席人员char", compute="_compute_room_users", store=True)
other_company_id = fields.Many2one('res.partner', string="外部公司")
host = fields.Many2one('hr.employee', string="主持人")
stationed_group = fields.Boolean(string="驻组参会")
stationed_group = fields.Boolean(string="派驻组")
other_company_user_ids = fields.Many2many('other.meet.employee', string="其他人员")
fleet_id = fields.Many2one('fleet.vehicle', string="车辆")
meeting_place = fields.Char(string="会议地点")
yuthon_report/static/src/components/yuthon_report/att_report.xml
+5 -5
View File
@@ -4,11 +4,11 @@
<t t-name="att_report.ReceivableReport">
<div class="container-fluid d-flex flex-column h-100 mt-2 pb-3">
<!-- 报表标题 居中 -->
<div class="row mb-2">
<div class="col-12 text-center">
<h5 t-esc="props.action.name"/>
</div>
</div>
<!-- <div class="row mb-2">-->
<!-- <div class="col-12 text-center">-->
<!-- <h5 t-esc="props.action.name"/>-->
<!-- </div>-->
<!-- </div>-->
<!-- 筛选卡片 -->
<div class="card mb-2">
yuthon_report/static/src/components/yuthon_report/receivable_message.xml
+5 -5
View File
@@ -3,11 +3,11 @@
<t t-name="yuthon_report.ReceiptLedgerReport">
<div class="container-fluid d-flex flex-column h-100 mt-2 pb-3">
<!-- 报表标题 居中 -->
<div class="row mb-2">
<div class="col-12 text-center">
<h5 t-esc="props.action.name"/>
</div>
</div>
<!-- <div class="row mb-2">-->
<!-- <div class="col-12 text-center">-->
<!-- <h5 t-esc="props.action.name"/>-->
<!-- </div>-->
<!-- </div>-->
<div class="card mb-2">
<div class="card-body">
yuthon_report/static/src/components/yuthon_report/receivable_report.xml
+5 -5
View File
@@ -4,11 +4,11 @@
<t t-name="youthon_report.ReceivableReport">
<div class="container-fluid d-flex flex-column h-100 mt-2 pb-3">
<!-- 报表标题 居中 -->
<div class="row mb-2">
<div class="col-12 text-center">
<h5 t-esc="props.action.name"/>
</div>
</div>
<!-- <div class="row mb-2">-->
<!-- <div class="col-12 text-center">-->
<!-- <h5 t-esc="props.action.name"/>-->
<!-- </div>-->
<!-- </div>-->
<!-- 筛选卡片 -->
<div class="card mb-2">
yuthon_report/static/src/components/yuthon_report/yuthon_contract_report.xml
+5 -5
View File
@@ -3,11 +3,11 @@
<t t-name="yuthon_report.ContractInfoReport">
<div class="container-fluid d-flex flex-column h-100 mt-2 pb-3">
<!-- 报表标题 居中 -->
<div class="row mb-2">
<div class="col-12 text-center">
<h5 t-esc="props.action.name"/>
</div>
</div>
<!-- <div class="row mb-2">-->
<!-- <div class="col-12 text-center">-->
<!-- <h5 t-esc="props.action.name"/>-->
<!-- </div>-->
<!-- </div>-->
<div class="card mb-2">
<div class="card-body">
yuthon_report/static/src/components/yuthon_report/yuthon_report.xml
+5 -5
View File
@@ -4,11 +4,11 @@
<t t-name="youthon_report.YouthonReport">
<div class="container-fluid d-flex flex-column h-100 mt-2 pb-3 ">
<!-- 报表标题 居中 -->
<div class="row mb-2">
<div class="col-12 text-center">
<h5 t-esc="props.action.name"/>
</div>
</div>
<!-- <div class="row mb-2">-->
<!-- <div class="col-12 text-center">-->
<!-- <h5 t-esc="props.action.name"/>-->
<!-- </div>-->
<!-- </div>-->
<div class="card mb-2">
<div class="row g-4">
yuthon_work_brand/views/hr_menus.xml
+2 -2
View File
@@ -763,8 +763,8 @@
<menuitem id="holiday_manage_menu_root_board" name="我的" web_icon="yuthon_work_brand,static/description/holiday.png" sequence="3">
<menuitem id="menu_workflow_approval_request_new" name="新建流程" action="soong_workflow.action_kklw_workflow_approval_request" sequence="5"/>
<menuitem id="menu_soong_workflow_todo_record" name="待办流程" action="soong_workflow.soong_workflow_record_todo_action" sequence="10"/>
<menuitem id="menu_soong_workflow_department_record" name="流程查询" action="soong_workflow.soong_workflow_department_record_action" sequence="15"/>
<menuitem id="menu_soong_workflow_done_record" name="已办流程" action="soong_workflow.soong_workflow_record_done_action" sequence="20"/>
<menuitem id="menu_soong_workflow_done_record" name="已办流程" action="soong_workflow.soong_workflow_record_done_action" sequence="15"/>
<menuitem id="menu_soong_workflow_department_record" name="流程查询" action="soong_workflow.soong_workflow_department_record_action" sequence="20"/>
<menuitem id="menu_workflow_approval_request_admin" name="流程监控" action="soong_workflow.soong_workflow_record_action_admin" sequence="25"/>
<menuitem id="menu_soong_workflow_hr_employee" name="人力资源流程" action="soong_workflow.soong_workflow_hr_employee_action" sequence="30" groups="soong_workflow.group_soong_workflow_hr"/>
<menuitem id="yuthon_official_incoming_normal" name="行政收文" action="yuthon_official.yuthon_official_incoming_normal_action" sequence="32"/>