Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[12.0][IMP] hr_timesheet_sheet: fix amount calculation issues + code simplification #211

Merged
merged 8 commits into from
Mar 25, 2019
Merged

[12.0][IMP] hr_timesheet_sheet: fix amount calculation issues + code simplification #211

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d050040
[IMP] Fix amount calculation issues + code simplification
astirpe Mar 20, 2019
c446686
[FIX] Fix employee_id related stuff
astirpe Mar 20, 2019
43ac91d
[IMP] Ease customizations of message_subscribe_users
astirpe Mar 21, 2019
433b28f
[IMP] List view easier to read
astirpe Mar 21, 2019
8829878
[IMP] Extra code simplification
astirpe Mar 21, 2019
d56b8e1
[IMP] Make use of batch create
astirpe Mar 22, 2019
6b4c206
[FIX] Update company when onchange employee_id
astirpe Mar 22, 2019
17e454e
[IMP] Code review
astirpe Mar 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions hr_timesheet_sheet/models/hr_timesheet_sheet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,11 +259,11 @@ def _compute_line_ids(self):
if not all([sheet.date_start, sheet.date_end]):
continue
matrix = sheet._get_data_matrix()
lines = self.env['hr_timesheet.sheet.line']
vals_list = []
for item in sorted(matrix, key=lambda l: self._sort_matrix(l)):
vals = sheet._get_default_sheet_line(matrix, item)
lines |= self.env['hr_timesheet.sheet.line'].create(vals)
vals_list.append(sheet._get_default_sheet_line(matrix, item))
sheet.clean_timesheets(matrix[item])
lines = self.env['hr_timesheet.sheet.line'].create(vals_list)
sheet.line_ids = lines

def _sort_matrix(self, line):
Expand Down