diff options
| author | jbm-odoo <jbm@odoo.com> | 2019-11-04 08:47:18 +0000 |
|---|---|---|
| committer | jbm-odoo <jbm@odoo.com> | 2019-11-06 10:08:50 +0000 |
| commit | 6b5bdbb476b849fac4e46a7d0082bc12bc6ae6e2 (patch) | |
| tree | 1bd212fc663c8305c0d681aaad27ffabe0949223 /addons/hr_contract | |
| parent | c83cac21a738702820ce5084c605d47fab06e909 (diff) | |
[IMP] hr_[contract,employee,recruitment,work_entry]: Add multi edit in view
Make some fields editable in multi edit.
Some onchange are tranformed in compute fields.
id=2078674
closes odoo/odoo#39711
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/hr_contract')
| -rw-r--r-- | addons/hr_contract/models/hr_contract.py | 4 | ||||
| -rw-r--r-- | addons/hr_contract/views/hr_contract_views.xml | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/addons/hr_contract/models/hr_contract.py b/addons/hr_contract/models/hr_contract.py index 6f92ca248af..4b931f9e50c 100644 --- a/addons/hr_contract/models/hr_contract.py +++ b/addons/hr_contract/models/hr_contract.py @@ -145,8 +145,8 @@ class Contract(models.Model): self._assign_open_contract() calendar = vals.get('resource_calendar_id') - if calendar and (self.state == 'open' or (self.state == 'draft' and self.kanban_state == 'done')): - self.mapped('employee_id').write({'resource_calendar_id': calendar}) + if calendar: + self.filtered(lambda c: c.state == 'open' or (c.state == 'draft' and c.kanban_state == 'done')).mapped('employee_id').write({'resource_calendar_id': calendar}) if 'state' in vals and 'kanban_state' not in vals: self.write({'kanban_state': 'normal'}) diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml index 35fa68756b9..5b4a0f08a18 100644 --- a/addons/hr_contract/views/hr_contract_views.xml +++ b/addons/hr_contract/views/hr_contract_views.xml @@ -206,18 +206,19 @@ decoration-bf="message_needaction == True" decoration-info="state == 'draft'" decoration-muted="state in ('close', 'cancel')" - decoration-danger="state == 'pending'"> - <field name="name"/> - <field name="employee_id"/> + decoration-danger="state == 'pending'" + multi_edit="1"> + <field name="name" readonly="1"/> + <field name="employee_id" readonly="1"/> <field name="job_id"/> <field name="resource_calendar_id"/> - <field name="date_start"/> - <field name="date_end"/> + <field name="date_start" readonly="1"/> + <field name="date_end" readonly="1"/> <field name="state"/> <field name="kanban_state" widget="state_selection" readonly="1"/> <field name="wage" invisible="1"/> <field name="message_needaction" invisible="1"/> - <field name="company_id" groups="base.group_multi_company"/> + <field name="company_id" groups="base.group_multi_company" readonly="1"/> </tree> </field> </record> |