FIX
This commit is contained in:
parent
16b333be85
commit
e4bee6afcb
|
@ -104,11 +104,6 @@ class Liquidation(Workflow, ModelSQL, ModelView):
|
|||
party_to_pay = fields.Many2One('party.party', 'Party to Pay', states=STATES)
|
||||
last_salary = fields.Numeric('Last Salary', states=STATES,
|
||||
digits=(16, 2))
|
||||
department = fields.Many2One('company.department', 'Department',
|
||||
required=False, depends=['employee'])
|
||||
project = fields.Many2One('project.work', 'Project', domain=[
|
||||
('type', '=', 'project')
|
||||
])
|
||||
|
||||
@classmethod
|
||||
def __setup__(cls):
|
||||
|
@ -161,10 +156,6 @@ class Liquidation(Workflow, ModelSQL, ModelView):
|
|||
def default_state():
|
||||
return 'draft'
|
||||
|
||||
@fields.depends('employee', 'department')
|
||||
def on_change_employee(self):
|
||||
if self.employee and self.employee.department:
|
||||
self.department = self.employee.department.id
|
||||
|
||||
@staticmethod
|
||||
def default_currency():
|
||||
|
|
|
@ -20,8 +20,6 @@ this repository contains the full copyright notices and license terms. -->
|
|||
<field name="time_contracting"/>
|
||||
<label name="description"/>
|
||||
<field name="description"/>
|
||||
<label name="project"/>
|
||||
<field name="project"/>
|
||||
<label name="account"/>
|
||||
<field name="account"/>
|
||||
<button name="compute_liquidation" string="Compute liquidation" colspan="2"/>
|
||||
|
@ -33,8 +31,6 @@ this repository contains the full copyright notices and license terms. -->
|
|||
<page string="Information" id="information">
|
||||
<label name="company"/>
|
||||
<field name="company"/>
|
||||
<label name="department"/>
|
||||
<field name="department"/>
|
||||
<label name="currency"/>
|
||||
<field name="currency"/>
|
||||
<label name="journal"/>
|
||||
|
|
|
@ -7,8 +7,6 @@ this repository contains the full copyright notices and license terms. -->
|
|||
<field name="start_period"/>
|
||||
<field name="end_period"/>
|
||||
<field name="kind"/>
|
||||
<field name="department"/>
|
||||
<field name="project"/>
|
||||
<field name="liquidation_date"/>
|
||||
<field name="gross_payments"/>
|
||||
<field name="total_deductions"/>
|
||||
|
|
Loading…
Reference in New Issue