diff --git a/hr_expense_recruitment/__manifest__.py b/hr_expense_recruitment/__manifest__.py index 448542f6..cd7012ff 100644 --- a/hr_expense_recruitment/__manifest__.py +++ b/hr_expense_recruitment/__manifest__.py @@ -1,6 +1,6 @@ { 'name': 'HR Expense Recruitment', - 'version': '12.0.1.0.0', + 'version': '16.0.1.0.0', 'author': 'Hibou Corp. ', 'category': 'Human Resources', 'summary': 'Assign Recruitment to expenses for reporting.', diff --git a/hr_expense_recruitment/models/hr_job.py b/hr_expense_recruitment/models/hr_job.py index 33492ade..8b9477d8 100644 --- a/hr_expense_recruitment/models/hr_job.py +++ b/hr_expense_recruitment/models/hr_job.py @@ -11,7 +11,6 @@ class HRJob(models.Model): compute_sudo=True) expense_ids = fields.One2many('hr.expense', 'job_id', string='Expenses') - @api.multi @api.depends('expense_ids.total_amount') def _compute_expense_total_amount(self): for job in self: diff --git a/hr_expense_recruitment/tests/test_expenses.py b/hr_expense_recruitment/tests/test_expenses.py index c8654a20..6b2fb929 100644 --- a/hr_expense_recruitment/tests/test_expenses.py +++ b/hr_expense_recruitment/tests/test_expenses.py @@ -1,15 +1,24 @@ -from odoo.tests import common +from odoo.addons.hr_expense.tests.common import TestExpenseCommon +from odoo.tests import tagged, Form -class TestJobExpense(common.TransactionCase): + +@tagged('-at_install', 'post_install') +class TestJobExpense(TestExpenseCommon): def test_fields(self): + + employee = self.env['hr.employee'].create({ + 'name': 'Leo Pinedo', + }) job = self.env['hr.job'].create({'name': 'Test Job'}) expense = self.env['hr.expense'].create({ 'name': 'Test Expense', - 'employee_id': self.env['hr.employee'].search([], limit=1).id, - 'product_id': self.env['product.product'].search([('can_be_expensed', '=', True)], limit=1).id, + 'employee_id': self.expense_employee.id, + 'product_id': self.product_a.id, 'unit_amount': 34.0, }) + self.assertTrue(job) + self.assertTrue(expense) self.assertFalse(job.expense_ids) self.assertEqual(job.expense_total_amount, 0.0) expense.job_id = job diff --git a/hr_expense_recruitment/views/hr_expense_views.xml b/hr_expense_recruitment/views/hr_expense_views.xml index fbc2b47f..c3603597 100644 --- a/hr_expense_recruitment/views/hr_expense_views.xml +++ b/hr_expense_recruitment/views/hr_expense_views.xml @@ -14,9 +14,9 @@ hr.expense.filter.inherit hr.expense - + - +