Elabore/odoo-usability
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt hr_holidays post wiz to new field

Browse Source
This commit is contained in:
Alexis de Lattre
2017-06-06 17:57:05 +02:00
parent e5221d6a96
commit 94926d188a
10 changed files with 98 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hr_holidays_usability/wizard/__init__.py
View File

@@ -1,3 +1,4 @@
# -*- encoding: utf-8 -*-
# -*- coding: utf-8 -*-
from . import hr_holidays_mass_allocation
from . import hr_holidays_post
from . import hr_holidays_to_payslip

30
hr_holidays_usability/wizard/hr_holidays_post.py → hr_holidays_usability/wizard/hr_holidays_to_payslip.py
View File

@@ -7,9 +7,9 @@ from odoo import models, fields, api, _
from odoo.exceptions import UserError
class HrHolidaysPost(models.TransientModel):
_name = 'hr.holidays.post'
_description = 'Wizard for post holidays'
class HrHolidaysToPayslip(models.TransientModel):
_name = 'hr.holidays.to.payslip'
_description = 'Wizard for transfer holidays to payslip'
before_date = fields.Date(
string='Select Leave Requests That Ended Before', required=True,
@@ -17,13 +17,13 @@ class HrHolidaysPost(models.TransientModel):
help="The wizard will select the validated holidays "
"that ended before that date (including holidays that "
"ended on that date).")
holidays_to_post_ids = fields.Many2many(
'hr.holidays', string='Leave Requests to Post',
holidays_to_payslip_ids = fields.Many2many(
'hr.holidays', string='Leave Requests to Transfer to Payslip',
domain=[
('type', '=', 'remove'),
('holiday_type', '=', 'employee'),
('state', '=', 'validate'),
('posted_date', '=', False),
('payslip_date', '=', False),
])
state = fields.Selection([
('draft', 'Draft'),
@@ -37,35 +37,35 @@ class HrHolidaysPost(models.TransientModel):
('type', '=', 'remove'),
('holiday_type', '=', 'employee'),
('state', '=', 'validate'),
('posted_date', '=', False),
('payslip_date', '=', False),
('vacation_date_to', '<=', self.before_date),
('company_id', '=', self.env.user.company_id.id),
])
self.write({
'state': 'done',
'holidays_to_post_ids': [(6, 0, hols.ids)],
'holidays_to_payslip_ids': [(6, 0, hols.ids)],
})
action = self.env['ir.actions.act_window'].for_xml_id(
'hr_holidays_usability', 'hr_holidays_post_action')
'hr_holidays_usability', 'hr_holidays_to_payslip_action')
action['res_id'] = self.id
return action
@api.multi
def run(self):
self.ensure_one()
# I have to make a copy of self.holidays_to_post_ids in a variable
# I have to make a copy of self.holidays_to_payslip_ids in a variable
# because, after the write, it doesn't have a value any more !!!
holidays_to_post = self.holidays_to_post_ids
holidays_to_payslip = self.holidays_to_payslip_ids
today = fields.Date.context_today(self)
if not self.holidays_to_post_ids:
raise UserError(_('No leave request to post.'))
self.holidays_to_post_ids.write({'posted_date': today})
if not self.holidays_to_payslip_ids:
raise UserError(_('No leave request to transfer to payslip.'))
self.holidays_to_payslip_ids.write({'payslip_date': today})
view_id = self.env.ref('hr_holidays_usability.hr_holiday_pivot').id
action = {
'name': _('Leave Requests'),
'res_model': 'hr.holidays',
'type': 'ir.actions.act_window',
'domain': [('id', 'in', holidays_to_post.ids)],
'domain': [('id', 'in', holidays_to_payslip.ids)],
'view_mode': 'pivot',
'view_id': view_id,
}

24
hr_holidays_usability/wizard/hr_holidays_post_view.xml → hr_holidays_usability/wizard/hr_holidays_to_payslip_view.xml
View File

@@ -7,22 +7,22 @@
<odoo>
<record id="hr_holidays_post_form" model="ir.ui.view">
<field name="name">hr_holidays_post_form</field>
<field name="model">hr.holidays.post</field>
<record id="hr_holidays_to_payslip_form" model="ir.ui.view">
<field name="name">hr_holidays_to_payslip_form</field>
<field name="model">hr.holidays.to.payslip</field>
<field name="arch" type="xml">
<form string="Post Leaves">
<group name="main" string="Leave Requests to Post">
<form string="Transfer Leaves to Payslip">
<group name="main" string="Leave Requests to Transfer to Payslip">
<field name="state" invisible="1"/>
<field name="before_date" states="draft"/>
<field name="holidays_to_post_ids" nolabel="1" colspan="2"
<field name="holidays_to_payslip_ids" nolabel="1" colspan="2"
context="{'tree_view_ref': 'hr_holidays.view_holiday'}"
states="done"/>
</group>
<footer>
<button name="select_date" type="object" string="Get Holiday Requests"
class="oe_highlight" states="draft"/>
<button name="run" type="object" string="Post"
<button name="run" type="object" string="Transfer to Payslip"
class="oe_highlight" states="done"/>
<button special="cancel" string="Cancel" class="oe_link"/>
</footer>
@@ -30,15 +30,15 @@
</field>
</record>
<record id="hr_holidays_post_action" model="ir.actions.act_window">
<field name="name">Post Leave Requests</field>
<field name="res_model">hr.holidays.post</field>
<record id="hr_holidays_to_payslip_action" model="ir.actions.act_window">
<field name="name">Transfer to Payslip</field>
<field name="res_model">hr.holidays.to.payslip</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<menuitem id="hr_holidays_post_menu"
action="hr_holidays_post_action"
<menuitem id="hr_holidays_to_payslip_menu"
action="hr_holidays_to_payslip_action"
parent="hr_holidays_administration_menu"
groups="hr_holidays.group_hr_holidays_manager"/>