Skip to content

[17.0][FIX] hr_timesheet_sheet: prevent deletion of timesheet entries when changing sheet period #848

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

Open
nihelgabsi-acsone wants to merge 1 commit into
base: 17.0
Choose a base branch
from
Open

[17.0][FIX] hr_timesheet_sheet: prevent deletion of timesheet entries when changing sheet period #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 5 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 @@ -421,11 +421,6 @@ def _compute_timesheet_ids(self):
domain = sheet._get_timesheet_sheet_lines_domain()
timesheets = AccountAnalyticLines.search(domain)
sheet.link_timesheets_to_sheet(timesheets)
sheet.timesheet_ids = [(6, 0, timesheets.ids)]

@api.onchange("date_start", "date_end", "employee_id")
def _onchange_scope(self):
self._compute_timesheet_ids()

@api.onchange("date_start", "date_end")
def _onchange_dates(self):
Expand Down Expand Up @@ -479,6 +474,7 @@ def create(self, vals_list):
for vals in vals_list:
self._check_employee_user_link(vals)
res = super().create(vals_list)
res._compute_timesheet_ids()
res.write({"state": "draft"})
return res

Expand Down
29 changes: 1 addition & 28 deletions hr_timesheet_sheet/tests/test_hr_timesheet_sheet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,17 +423,10 @@ def test_3(self):
}
)
sheet_form = Form(self.sheet_model.with_user(self.user))
self.assertEqual(len(sheet_form.line_ids), 7)
self.assertEqual(len(sheet_form.timesheet_ids), 1)
self.assertTrue(self.aal_model.search([("id", "=", timesheet.id)]))

timesheets = [x.get("id") for x in sheet_form.timesheet_ids._records]
sheet = sheet_form.save()
# analytic line cleaned up on form save
self.assertFalse(self.aal_model.search([("id", "in", timesheets)]))
self.assertFalse(timesheet.exists())
self.assertEqual(len(sheet.line_ids), 0)
self.assertEqual(len(sheet.timesheet_ids), 0)
self.assertFalse(self.aal_model.search([("id", "=", timesheet.id)]))

def test_4(self):
timesheet_1 = self.aal_model.create(
Expand Down Expand Up @@ -521,11 +514,7 @@ def test_5(self):
}
)
sheet_form = Form(self.sheet_model.with_user(self.user))
timesheets = [x.get("id") for x in sheet_form.timesheet_ids._records]
sheet = sheet_form.save()
sheet.timesheet_ids = [(6, 0, timesheets)]
with Form(sheet.with_user(self.user)):
pass # trigger edit and save
self.assertEqual(len(sheet.line_ids), 7)
self.assertEqual(len(sheet.timesheet_ids), 2)
line = sheet.line_ids.filtered(lambda line: line.unit_amount != 0.0)
Expand Down Expand Up @@ -617,11 +606,7 @@ def test_6(self):
}
)
sheet_form = Form(self.sheet_model.with_user(self.user))
timesheets = [x.get("id") for x in sheet_form.timesheet_ids._records]
sheet = sheet_form.save()
sheet.timesheet_ids = [(6, 0, timesheets)]
with Form(sheet.with_user(self.user)):
pass # trigger edit and save
self.assertEqual(len(sheet.line_ids), 7)
self.assertEqual(len(sheet.timesheet_ids), 5)
line = sheet.line_ids.filtered(lambda line: line.unit_amount != 0.0)
Expand Down Expand Up @@ -799,11 +784,7 @@ def test_11_onchange_unit_amount(self):
}
)
sheet_form = Form(self.sheet_model.with_user(self.user))
timesheets = [x.get("id") for x in sheet_form.timesheet_ids._records]
sheet = sheet_form.save()
sheet.timesheet_ids = [(6, 0, timesheets)]
with Form(sheet.with_user(self.user)):
pass # trigger edit and save
self.assertEqual(len(sheet.timesheet_ids), 2)
self.assertEqual(len(sheet.line_ids), 7)

Expand Down Expand Up @@ -851,11 +832,7 @@ def test_12_creating_sheet(self):
}
)
sheet_form = Form(self.sheet_model.with_user(self.user))
timesheets = [x.get("id") for x in sheet_form.timesheet_ids._records]
sheet = sheet_form.save()
sheet.timesheet_ids = [(6, 0, timesheets)]
with Form(sheet.with_user(self.user)):
pass # trigger edit and save
self.assertEqual(len(sheet.timesheet_ids), 1)
self.assertEqual(len(sheet.line_ids), 7)

Expand Down Expand Up @@ -933,11 +910,7 @@ def test_15(self):
)
self.assertNotEqual(self.company, self.company_2)
sheet_form = Form(self.sheet_model.with_user(self.user))
timesheets = [x.get("id") for x in sheet_form.timesheet_ids._records]
sheet = sheet_form.save()
sheet.timesheet_ids = [(6, 0, timesheets)]
with Form(sheet.with_user(self.user)):
pass # trigger edit and save
self.assertEqual(sheet.company_id, self.company)
self.assertEqual(len(sheet.timesheet_ids), 1)
self.assertEqual(sheet.timesheet_ids.company_id, self.company)
Expand Down