diff --git a/hr_expense_vendor/README.rst b/hr_expense_vendor/README.rst new file mode 100644 index 00000000..e702d50b --- /dev/null +++ b/hr_expense_vendor/README.rst @@ -0,0 +1,30 @@ +************************* +Hibou - HR Expense Vendor +************************* + +Records the vendor paid on expenses. + +For more information and add-ons, visit `Hibou.io `_. + + +============= +Main Features +============= + +* Validates presence of assigned vendor to process a Company Paid Expense. +* If the expense is company paid, then the vendor will be the partner used when creating the journal entry, this makes it much easier to reconcile. +* Additionally, adds the expense reference to the journal entry to make it easier to reconcile in either case. + + +.. image:: https://user-images.githubusercontent.com/15882954/41182457-9b692f92-6b2a-11e8-9d5a-d8ef2f19f198.png + :alt: 'Expense Detail' + :width: 988 + :align: left + +======= +License +======= + +Please see `LICENSE `_. + +Copyright Hibou Corp. 2018 diff --git a/hr_expense_vendor/__init__.py b/hr_expense_vendor/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/hr_expense_vendor/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/hr_expense_vendor/__manifest__.py b/hr_expense_vendor/__manifest__.py new file mode 100644 index 00000000..2cde209e --- /dev/null +++ b/hr_expense_vendor/__manifest__.py @@ -0,0 +1,19 @@ +{ + 'name': 'HR Expense Vendor', + 'version': '14.0.1.0.0', + 'author': 'Hibou Corp. ', + 'category': 'Human Resources', + 'summary': 'Record the vendor paid on expenses.', + 'description': """ +Record the vendor paid on expenses. +""", + 'website': 'https://hibou.io/', + 'depends': [ + 'hr_expense', + ], + 'data': [ + 'views/hr_expense_views.xml', + ], + 'installable': True, + 'auto_install': False, +} diff --git a/hr_expense_vendor/models/__init__.py b/hr_expense_vendor/models/__init__.py new file mode 100644 index 00000000..86b1ea31 --- /dev/null +++ b/hr_expense_vendor/models/__init__.py @@ -0,0 +1 @@ +from . import hr_expense diff --git a/hr_expense_vendor/models/hr_expense.py b/hr_expense_vendor/models/hr_expense.py new file mode 100644 index 00000000..47b99793 --- /dev/null +++ b/hr_expense_vendor/models/hr_expense.py @@ -0,0 +1,26 @@ +from odoo import api, fields, models +from odoo.exceptions import ValidationError + + +class HRExpense(models.Model): + _inherit = 'hr.expense' + + vendor_id = fields.Many2one('res.partner', string='Vendor') + + def _get_account_move_line_values(self): + move_line_values_by_expense = super(HRExpense, self)._get_account_move_line_values() + for expense in self.filtered(lambda e: e.payment_mode == 'company_account'): + if not expense.vendor_id: + raise ValidationError('You must have an assigned vendor to process a Company Paid Expense') + move_line_values = move_line_values_by_expense[expense.id] + for line_values in move_line_values: + new_name = expense.name.split('\n')[0][:64] + (' - ' + str(expense.reference) if expense.reference else '') + line_values['name'] = new_name[:64] + line_values['partner_id'] = expense.vendor_id.id + return move_line_values_by_expense + + +class HRExpenseSheet(models.Model): + _inherit = 'hr.expense.sheet' + + expense_line_ids = fields.One2many(states={'done': [('readonly', True)], 'post': [('readonly', True)]}) diff --git a/hr_expense_vendor/tests/__init__.py b/hr_expense_vendor/tests/__init__.py new file mode 100644 index 00000000..bf77393e --- /dev/null +++ b/hr_expense_vendor/tests/__init__.py @@ -0,0 +1 @@ +from . import test_expenses diff --git a/hr_expense_vendor/tests/test_expenses.py b/hr_expense_vendor/tests/test_expenses.py new file mode 100644 index 00000000..949fa021 --- /dev/null +++ b/hr_expense_vendor/tests/test_expenses.py @@ -0,0 +1,59 @@ +from odoo.addons.hr_expense.tests.common import TestExpenseCommon +from odoo.exceptions import ValidationError +from odoo.tests import Form, tagged + + +@tagged('-at_install', 'post_install') +class TestCheckVendor(TestExpenseCommon): + + @classmethod + def setUpClass(cls, chart_template_ref=None): + super(TestCheckVendor, cls).setUpClass(chart_template_ref=chart_template_ref) + cls.vendor_id = cls.env.ref('base.res_partner_3') + cls.tax = cls.env['account.tax'].create({ + 'name': 'Expense 10%', + 'amount': 10, + 'amount_type': 'percent', + 'type_tax_use': 'purchase', + 'price_include': True, + }) + + def test_journal_entry_vendor(self): + expense_form = Form(self.env['hr.expense']) + expense_form.name = 'Car Travel Expenses' + expense_form.employee_id = self.expense_employee + expense_form.product_id = self.product_a + expense_form.unit_amount = 700.00 + expense_form.tax_ids.clear() + expense_form.tax_ids.add(self.tax) + expense_form.analytic_account_id = self.analytic_account_1 + expense_form.payment_mode = 'company_account' + expense = expense_form.save() + + action_submit_expenses = expense.action_submit_expenses() + expense_sheet = self.env[action_submit_expenses['res_model']].browse(action_submit_expenses['res_id']) + + self.assertEqual(expense_sheet.state, 'submit', 'Expense is not in Submitted state') + # Approve + expense_sheet.approve_expense_sheets() + self.assertEqual(expense_sheet.state, 'approve', 'Expense is not in Approved state') + # Create Expense Entries + with self.assertRaises(ValidationError): + expense_sheet.action_sheet_move_create() + + expense.vendor_id = self.vendor_id + expense_sheet.action_sheet_move_create() + self.assertEqual(expense_sheet.state, 'done') + self.assertTrue(expense_sheet.account_move_id.id, 'Expense Journal Entry is not created') + + # [(line.debit, line.credit, line.tax_line_id.id) for line in expense_sheet.account_move_id.line_ids] + # should get this result [(0.0, 700.0, False), (63.64, 0.0, 179), (636.36, 0.0, False)] + for line in expense_sheet.account_move_id.line_ids: + if line.credit: + self.assertEqual(line.partner_id, self.vendor_id) + self.assertAlmostEqual(line.credit, 700.00) + else: + if not line.tax_line_id == self.tax: + self.assertAlmostEqual(line.debit, 636.36) + else: + self.assertAlmostEqual(line.debit, 63.64) diff --git a/hr_expense_vendor/views/hr_expense_views.xml b/hr_expense_vendor/views/hr_expense_views.xml new file mode 100644 index 00000000..d1903271 --- /dev/null +++ b/hr_expense_vendor/views/hr_expense_views.xml @@ -0,0 +1,24 @@ + + + + hr.expense.sheet.form.inherit + hr.expense.sheet + + + + + + + + + + hr.expense.form.inherit + hr.expense + + + + + + + + \ No newline at end of file