Merge branch 'pawan_branch' into 'development'

sort hours within date

See merge request prakash.jain/cor-odoo!168
This commit is contained in:
pawan.sharma 2021-04-06 22:24:15 -07:00
commit a07d2052fe
2 changed files with 3 additions and 1 deletions

View File

@ -13,6 +13,8 @@ import dateutil.parser
class AccountAnalyticLine(models.Model):
_inherit = 'account.analytic.line'
#_order = 'date desc, id desc'
_order = 'start_datetime desc, unit_amount'
@api.depends('project_id', 'employee_id')
def name_get(self):

View File

@ -9,7 +9,7 @@ class ProjectTimelineReport(models.Model):
_name = "project.timesheet.report"
_description = "Project Timesheet Report"
_order = 'start_date desc, duration desc'
_order = 'start_date desc, duration desc, project_id desc'
_auto = False
start_date = fields.Date(string='Start Time', readonly=True)