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

!4563 更新一下 property_meter_water_views 视图

Browse Source 
Merge pull request !4563 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-08-15 01:25:28 +00:00
committed by Gitee
parent bca36df156 99e1e176d9
commit 50966d23cd
2 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/models/planning_template_inherit.py
+5 -4
View File
@@ -104,10 +104,10 @@ class PlanningSlotTemplate(models.Model):
@api.depends('role_id','planning_name')
def _compute_display_name(self):
for shift_template in self:
name = '{} {} {}'.format(
shift_template.planning_name,
shift_template.name,
name = '{} {}'.format(
shift_template.role_id.name if shift_template.role_id.name is not False else '',
shift_template.planning_name
)
shift_template.display_name = name
@@ -129,7 +129,8 @@ class Planning(models.Model):
start_time_str = new_start_datetime.strftime("%Y-%m-%d")
# new_end_datetime = slot.end_datetime + timedelta(hours=8)
# end_time_str = new_end_datetime.strftime("%H:%M:%S")
slot.display_name = f"{planning_name + '/' + start_time_str}"
# slot.display_name = f"{planning_name + '/' + start_time_str}"
slot.display_name = f"{planning_name}"
@api.depends('template_id.color')
def _compute_color(self):
yuthon_hr_attendance/views/inherit_planning_slot_views.xml
+42 -10
View File
@@ -10,12 +10,43 @@
</xpath>
</field>
</record>
<record id="planning_view_form_in_gantt_inherit" model="ir.ui.view">
<field name="name">planning.slot.form.gantt.inherit</field>
<field name="model">planning.slot</field>
<field name="priority">10</field>
<field name="inherit_id" ref="planning.planning_view_form_in_gantt"/>
<field name="arch" type="xml">
<xpath expr="//footer/button[@name='action_send']" position="replace">
</xpath>
<xpath expr="//footer/button[@name='action_send']" position="replace">
</xpath>
<xpath expr="//footer/button[@name='auto_plan_id']" position="replace"></xpath>
<xpath expr="//footer/button[@name='action_unpublish']" position="replace"></xpath>
</field>
</record>
<record id="planning_view_gantt" model="ir.ui.view">
<field name="name">planning.slot.gantt</field>
<field name="model">planning.slot</field>
<field name="inherit_id" ref="planning.planning_view_gantt" />
<field name="arch" type="xml">
<xpath expr="/gantt" position="attributes">
<attribute name="form_view_id">%(planning_view_form_in_gantt_inherit)d</attribute>
<attribute name="default_scale">month</attribute>
</xpath>
</field>
</record>
<record id="hr_planning_slot_inherit_form" model="ir.ui.view">
<field name="name">planning.slot.form.inherit</field>
<field name="model">planning.slot</field>
<field name="inherit_id" ref="planning.planning_view_form"/>
<field name="arch" type="xml">
<xpath expr="//form" position="attributes">
<xpath expr="//form" position="attributes">
<attribute name="create">0</attribute>
</xpath>
<xpath expr="//label[@for='allocated_hours']" position="attributes">
@@ -37,8 +68,8 @@
<field name="res_model">planning.slot</field>
<field name="view_mode">gantt,calendar,tree,form,kanban,pivot,graph</field>
<field name="context">
{'planning_expand_resource': 1, 'planning_expand_role': 1, 'search_default_group_by_resource': 1,
'search_default_group_by_department': 1}
{'planning_expand_resource': 1, 'planning_expand_role': 1, 'search_default_group_by_resource': 1,
'search_default_group_by_department': 1}
</field>
<field name="domain">[('department_id.name', 'in', ['保安部', '班组A', '班组B', '班组C'])]</field>
</record>
@@ -68,10 +99,10 @@
<field name="res_model">planning.slot</field>
<field name="view_mode">tree</field>
<field name="view_mode">gantt,calendar,tree,form,kanban,pivot,graph</field>
<field name="domain">[('department_id.name', 'in', ['工程部','高压班','运行班','综合班'])]</field>
<field name="context">
{'planning_expand_resource': 1, 'planning_expand_role': 1, 'search_default_group_by_resource': 1,
'search_default_group_by_department': 1}
<field name="domain">[('department_id.name', 'in', ['工程部', '高压班', '运行班', '综合班'])]</field>
<field name="context">
{'planning_expand_resource': 1, 'planning_expand_role': 1, 'search_default_group_by_resource': 1,
'search_default_group_by_department': 1}
</field>
</record>
<record id="action_planning_slot_form3" model="ir.actions.act_window">
@@ -96,20 +127,21 @@
<field name="view_mode">tree</field>
<field name="view_mode">gantt,calendar,tree,form,kanban,pivot,graph</field>
<field name="context">{'planning_expand_resource': 1, 'planning_expand_role': 1}</field>
<field name="domain">[('department_id.name','=','综合班')]]</field>
<field name="domain">[('department_id.name', '=', '综合班')]]</field>
</record>
<record id="action_planning_slot_form6" model="ir.actions.act_window">
<field name="name">联安粮库</field>
<field name="res_model">planning.slot</field>
<field name="view_mode">gantt,calendar,tree,form,kanban,pivot,graph</field>
<field name="context">{'planning_expand_resource': 1, 'planning_expand_role': 1}</field>
<field name="domain">[('department_id.name','in',['仓储组', '综合组','保管组', '机安组', '1库', '2库', '3库', '联安粮库'])]]</field>
<field name="domain">[('department_id.name', 'in',
['仓储组', '综合组', '保管组', '机安组', '1库', '2库', '3库', '联安粮库'])]]</field>
</record>
<record id="action_planning_slot_form7" model="ir.actions.act_window">
<field name="name">客服中心</field>
<field name="res_model">planning.slot</field>
<field name="view_mode">gantt,calendar,tree,form,kanban,pivot,graph</field>
<field name="context">{'planning_expand_resource': 1, 'planning_expand_role': 1}</field>
<field name="domain">[('department_id.name','=', '客户部')]</field>
<field name="domain">[('department_id.name', '=', '客户部')]</field>
</record>
</odoo>