Add multi-company support hr_holidays_usability
Add modules hr_holidays_lunch_voucher and hr_holidays_lunch_voucher_natixis
This commit is contained in:
@@ -31,7 +31,9 @@ class HrHolidaysMassAllocation(models.TransientModel):
|
||||
@api.model
|
||||
def _default_employees(self):
|
||||
return self.env['hr.employee'].search([
|
||||
('holiday_exclude_mass_allocation', '=', False)])
|
||||
('holiday_exclude_mass_allocation', '=', False),
|
||||
('company_id', '=', self.env.user.company_id.id),
|
||||
])
|
||||
|
||||
@api.model
|
||||
def _get_default_holiday_status(self):
|
||||
|
||||
@@ -56,6 +56,7 @@ class HrHolidaysPost(models.TransientModel):
|
||||
('state', '=', 'validate'),
|
||||
('posted_date', '=', False),
|
||||
('vacation_date_to', '<=', self.before_date),
|
||||
('company_id', '=', self.env.user.company_id.id),
|
||||
])
|
||||
self.write({
|
||||
'state': 'done',
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
<field name="name">hr_holidays_post_form</field>
|
||||
<field name="model">hr.holidays.post</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Post Leaves" version="7.0">
|
||||
<form string="Post Leaves">
|
||||
<group name="main" string="Leave Requests to Post">
|
||||
<field name="state" invisible="1"/>
|
||||
<field name="before_date" states="draft"/>
|
||||
<field name="holidays_to_post_ids" nolabel="1"
|
||||
context="{'tree_view_ref': 'hr_holidays.view_holiday'}"
|
||||
states="done"/>
|
||||
states="done" colspan="2"/>
|
||||
</group>
|
||||
<footer>
|
||||
<button name="select_date" type="object" string="Get Holiday Requests"
|
||||
|
||||
Reference in New Issue
Block a user