Skip to content

Commit 80397f4

Browse files
committed
Merge PR #735 into 16.0
Signed-off-by rafaelbn
2 parents 7a56c15 + cd27944 commit 80397f4

5 files changed

+32
-0
lines changed

hr_employee_cost_history/models/hr_employee_timesheet_cost_history.py

+1
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ class HrEmployeeTimesheetCostHistory(models.Model):
2222
help="The cost change has effect since this date.",
2323
default=fields.Date.context_today,
2424
)
25+
comment = fields.Char()

hr_employee_cost_history/tests/test_hr_timesheet.py

+25
Original file line numberDiff line numberDiff line change
@@ -196,3 +196,28 @@ def test_update_employee_history_cost(self):
196196
)
197197
last_timesheet = timesheet_cost_ids[-1]
198198
self.assertEqual(last_timesheet.hourly_cost, 20.0)
199+
200+
@users("test_user_manager")
201+
def test_field_comment(self):
202+
"""Test comment field."""
203+
wizard = Form(
204+
self.env["hr.employee.timesheet.cost.wizard"].with_context(
205+
default_employee_id=self.employee.id,
206+
default_hourly_cost=123,
207+
default_starting_date=date.today(),
208+
default_comment="Test comment",
209+
)
210+
)
211+
wizard_result = wizard.save()
212+
wizard_result.update_employee_cost()
213+
comment = (
214+
self.env["hr.employee.timesheet.cost.history"]
215+
.search(
216+
[
217+
("employee_id", "=", self.employee.id),
218+
("hourly_cost", "=", 123),
219+
]
220+
)
221+
.comment
222+
)
223+
self.assertEqual(comment, "Test comment")

hr_employee_cost_history/views/hr_employee_timesheet_cost_history_views.xml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<tree>
1111
<field name="hourly_cost" />
1212
<field name="starting_date" />
13+
<field name="comment" />
1314
<field name="create_uid" optional="hide" />
1415
<field name="create_date" optional="hide" />
1516
</tree>

hr_employee_cost_history/wizards/hr_employee_timesheet_cost_wizard.py

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class HrEmployeeTimesheetCost(models.TransientModel):
2020
default=fields.Datetime.now,
2121
string="From Date",
2222
)
23+
comment = fields.Char()
2324

2425
@api.model
2526
def default_get(self, fields):
@@ -54,6 +55,7 @@ def update_employee_cost(self):
5455
"currency_id": self.currency_id.id,
5556
"hourly_cost": self.hourly_cost,
5657
"starting_date": self.starting_date,
58+
"comment": self.comment,
5759
}
5860
),
5961
],

hr_employee_cost_history/wizards/hr_employee_timesheet_cost_wizard_views.xml

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<field name="starting_date" />
1818
</group>
1919
</group>
20+
<group>
21+
<field name="comment" />
22+
</group>
2023
</sheet>
2124
<footer>
2225
<button

0 commit comments

Comments
 (0)