subh_pal_org
/
cor
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pawan_branch' into 'development' 

Pawan branch

See merge request prakash.jain/cor-odoo!169
This commit is contained in:
pawan.sharma 2021-04-06 23:21:01 -07:00
parent a07d2052fe fc09e07f35
commit 38b24543aa
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cor_custom/models/analytic.py
View File

@ -14,7 +14,7 @@ import dateutil.parser
class AccountAnalyticLine(models.Model):
_inherit = 'account.analytic.line'
#_order = 'date desc, id desc'
_order = 'start_datetime desc, unit_amount'
_order = 'date desc, unit_amount desc'
@api.depends('project_id', 'employee_id')
def name_get(self):
@ -39,6 +39,7 @@ class AccountAnalyticLine(models.Model):
#end_time = fields.Float(string='End Time', digits=(16, 2))
start_datetime = fields.Datetime("Start Time", required=True)
end_datetime = fields.Datetime("End Time", required=True)
date = fields.Date('Date', required=True, index=True, compute='_compute_start_end_date', store=True)
unit_amount = fields.Float('Duration', default=0.0)
parent_project = fields.Many2one('project.project', related='project_id.parent_project', string='Parent Project')
sub_project = fields.Many2one('project.project', domain="[('is_sub_project', '=', True)]",
@ -218,7 +219,8 @@ class AccountAnalyticLine(models.Model):
self.project_id._onchange_calculate_timesheet_hours()
return res
@api.onchange('start_datetime', 'end_datetime')
def _onchange_start_end_date(self):
if self.start_datetime:
self.date = self.start_datetime.date()
@api.depends('start_datetime', 'end_datetime')
def _compute_start_end_date(self):
for rec in self:
if rec.start_datetime:
rec.date = rec.start_datetime.date()