devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3429 from expsa/hr_change_title 

delete calende
This commit is contained in:
eslamtalaat744 2025-06-04 14:45:14 +03:00 committed by GitHub
parent ae51ec9121 7fccd99d60
commit ffcccb72f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
odex25_hr/hr_holidays_public/models/hr_holidays.py
View File

@ -2060,10 +2060,5 @@ class holidaysAttach(models.Model):
# return result
class ResConfigSettings(models.TransientModel):
_inherit = 'res.config.settings'
resource_calendar_id = fields.Many2one(
'resource.calendar', 'Company Working Hours',
related='company_id.resource_calendar_id', readonly=False)

14
odex25_hr/hr_holidays_public/views/leaves_balance.xml
View File

@ -10,6 +10,18 @@
<field name="search_view_id" ref="hr_holidays_community.view_hr_holidays_filter"/>
</record>
<!-- <record model="ir.actions.act_window" id="leaves_balance_actionn">-->
<!-- <field name="name">Leaves Balance</field>-->
<!-- <field name="res_model">hr.holidays</field>-->
<!-- <field name="view_mode">tree,form</field>-->
<!-- <field name="domain">[('type','=','add'),('check_allocation_view','=','balance')]</field>-->
<!-- <field name="context">{'search_default_employee_id': [active_id], 'default_employee_id': active_id, 'search_default_group_type': 1,-->
<!-- 'search_default_year': 1,'default_type':'add', 'default_check_allocation_view': 'balance'}</field>-->
<!-- <field name="search_view_id" ref="hr_holidays_community.view_hr_holidays_filter"/>-->
<!-- </record>-->
<record id="view_employee_form_leave_inheritt" model="ir.ui.view">
<field name="name">hr.employee.leave.form.inherit</field>
<field name="model">hr.employee</field>
@ -25,7 +37,7 @@
</xpath>
<xpath expr="//div[@name='button_box']" position="inside">
<field name="show_leaves" invisible="1"/>
<button name="%(leaves_balance_action)d"
<button name="%(leaves_balance_actionn)d"
type="action"
class="oe_stat_button"
icon="fa-calendar"