!11802 公共假期

Merge pull request !11802 from 李鹏宇/dev_wang
This commit is contained in:
李鹏宇
2026-05-31 07:30:35 +00:00
committed by Gitee
2 changed files with 18 additions and 7 deletions
@@ -144,4 +144,10 @@ class ResourceCalendarLeave(models.Model):
res = super().default_get(fields_list)
if 'company_id' in fields_list:
res['company_id'] = False
return res
return res
def unlink_company_id(self):
for record in self:
if not record.resource_id:
record.company_id = False
return True
@@ -55,7 +55,7 @@
<!-- <div invisible="is_elasticity_work_time in ['is_allow_late_early_leave','no']">-->
<!-- <field name="leave_go_allow_late" style="width: 5%"/>分钟-->
<!-- </div>-->
<!-- <label for="leave_go_allow_early" string="下班允许迟到" invisible="is_elasticity_work_time in ['is_allow_late_early_leave','no']"/>-->
<!-- <label for="leave_go_allow_early" string="下班允许早退" invisible="is_elasticity_work_time in ['is_allow_late_early_leave','no']"/>-->
<!-- <div invisible="is_elasticity_work_time in ['is_allow_late_early_leave','no']">-->
<!-- <field name="leave_go_allow_early" style="width: 5%"/>分钟-->
<!-- </div>-->
@@ -87,8 +87,8 @@
<field name="model">resource.calendar.leaves</field>
<field name="inherit_id" ref="resource.resource_calendar_leave_tree"/>
<field name="arch" type="xml">
<xpath expr="//tree/field[@name='company_id']" position="attributes">
<attribute name="column_invisible">True</attribute>
<xpath expr="//tree" position="attributes">
<attribute name="create">false</attribute>
</xpath>
<xpath expr="//tree/field[@name='date_to']" position="after">
<field name="alternate_rest_day"/>
@@ -109,9 +109,6 @@
<field name="model">resource.calendar.leaves</field>
<field name="inherit_id" ref="resource.resource_calendar_leave_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='company_id'][@groups='base.group_multi_company']" position="attributes">
<attribute name="invisible">1</attribute>
</xpath>
<xpath expr="//field[@name='date_to']" position="after">
<field name="alternate_rest_day"/>
<field name="holidays"/>
@@ -138,4 +135,12 @@
</xpath>
</field>
</record>
<record id="action_unlink_company_id" model="ir.actions.server">
<field name="name">清空公司绑定</field>
<field name="model_id" ref="model_resource_calendar_leaves"/>
<field name="binding_model_id" ref="model_resource_calendar_leaves"/>
<field name="state">code</field>
<field name="code">records.unlink_company_id()</field>
</record>
</odoo>