Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch
This commit is contained in:
commit
9fdbd2b445
|
@ -16,7 +16,7 @@ class AccountAnalyticLine(models.Model):
|
|||
end_time = fields.Float(string='End Time', digits=(16, 2))
|
||||
unit_amount = fields.Float('Duration', default=0.0)
|
||||
|
||||
@api.onchange('employee_id')
|
||||
"""@api.onchange('employee_id')
|
||||
def _onchange_employee_id(self):
|
||||
domain = []
|
||||
if self.employee_id and self.employee_id.user_id:
|
||||
|
@ -34,9 +34,9 @@ class AccountAnalyticLine(models.Model):
|
|||
result = {
|
||||
'domain': {'project_id': domain},
|
||||
}
|
||||
return result
|
||||
return result"""
|
||||
|
||||
@api.onchange('project_id')
|
||||
"""@api.onchange('project_id')
|
||||
def _onchange_project_id(self):
|
||||
domain = [] if not self.project_id else [('project_id', '=', self.project_id.id)]
|
||||
manager_id = []
|
||||
|
@ -59,7 +59,7 @@ class AccountAnalyticLine(models.Model):
|
|||
if self.project_id != self.task_id.project_id:
|
||||
# reset task when changing project
|
||||
self.task_id = False
|
||||
return result
|
||||
return result"""
|
||||
|
||||
_sql_constraints = [
|
||||
('check_start_time_lower_than_24', 'CHECK(start_time <= 24)', 'You cannot have a start hour greater than 24'),
|
||||
|
|
|
@ -67,7 +67,7 @@ class Project(models.Model):
|
|||
|
||||
|
||||
@api.depends('cost', 'expenses_amt', 'budgeted_revenue')
|
||||
def _compute_consultant_timesheet_hours(self):
|
||||
def _compute_calc(self):
|
||||
for record in self:
|
||||
consultant_cost = 0.0
|
||||
hour = 0.0
|
||||
|
|
Loading…
Reference in New Issue