Merge branch 'mig/12.0/hr_expense_vendor' into 12.0-test

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 <https://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 <https://github.com/hibou-io/hibou-odoo-suite/blob/11.0/LICENSE>`_.
+
+Copyright Hibou Corp. 2018

hr_expense_vendor/__init__.py

@@ -0,0 +1 @@
+from . import models

hr_expense_vendor/__manifest__.py

@@ -0,0 +1,19 @@
+{
+    'name': 'HR Expense Vendor',
+    'version': '12.0.1.0.0',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    '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,
+}

hr_expense_vendor/models/__init__.py

@@ -0,0 +1 @@
+from . import hr_expense

hr_expense_vendor/models/hr_expense.py

@@ -0,0 +1,27 @@
+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')
+
+    @api.multi
+    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(self.reference) if self.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)]})

hr_expense_vendor/tests/__init__.py

@@ -0,0 +1 @@
+from . import test_expenses

hr_expense_vendor/tests/test_expenses.py

@@ -0,0 +1,56 @@
+from odoo.addons.hr_expense.tests.test_expenses import TestAccountEntry
+from odoo.exceptions import ValidationError
+
+
+class TestCheckVendor(TestAccountEntry):
+
+    def setUp(self):
+        super(TestCheckVendor, self).setUp()
+        self.vendor_id = self.env.ref('base.res_partner_3')
+
+    def test_journal_entry_vendor(self):
+        expense = self.env['hr.expense.sheet'].create({
+            'name': 'Expense for John Smith',
+            'employee_id': self.employee.id,
+        })
+        expense_line = self.env['hr.expense'].create({
+            'name': 'Car Travel Expenses',
+            'employee_id': self.employee.id,
+            'product_id': self.product_expense.id,
+            'unit_amount': 700.00,
+            'tax_ids': [(6, 0, [self.tax.id])],
+            'sheet_id': expense.id,
+            'analytic_account_id': self.analytic_account.id,
+        })
+        expense.payment_mode = 'company_account'
+        expense_line.payment_mode = 'company_account'
+        expense_line._onchange_product_id()
+
+        # State should default to draft
+        self.assertEquals(expense.state, 'draft', 'Expense should be created in Draft state')
+        # Submitted to Manager
+        expense.action_submit_sheet()
+        self.assertEquals(expense.state, 'submit', 'Expense is not in Reported state')
+        # Approve
+        expense.approve_expense_sheets()
+        self.assertEquals(expense.state, 'approve', 'Expense is not in Approved state')
+        # Create Expense Entries
+        with self.assertRaises(ValidationError):
+            expense.action_sheet_move_create()
+
+        expense_line.vendor_id = self.vendor_id
+        expense.action_sheet_move_create()
+        self.assertEquals(expense.state, 'done')
+        self.assertTrue(expense.account_move_id.id, 'Expense Journal Entry is not created')
+
+        # [(line.debit, line.credit, line.tax_line_id.id) for line in self.expense.expense_line_ids.account_move_id.line_ids]
+        # should git this result [(0.0, 700.0, False), (63.64, 0.0, 179), (636.36, 0.0, False)]
+        for line in expense.account_move_id.line_ids:
+            if line.credit:
+                self.assertEqual(line.partner_id, self.vendor_id)
+                self.assertAlmostEquals(line.credit, 700.00)
+            else:
+                if not line.tax_line_id == self.tax:
+                    self.assertAlmostEquals(line.debit, 636.36)
+                else:
+                    self.assertAlmostEquals(line.debit, 63.64)

hr_expense_vendor/views/hr_expense_views.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_hr_expense_sheet_form_inherit" model="ir.ui.view">
+        <field name="name">hr.expense.sheet.form.inherit</field>
+        <field name="model">hr.expense.sheet</field>
+        <field name="inherit_id" ref="hr_expense.view_hr_expense_sheet_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='expense_line_ids']/tree/field[@name='name']" position="after">
+                <field name="vendor_id" domain="[('supplier', '=', True)]"
+                       context="{'default_supplier': True}" groups="account.group_account_user"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="hr_expense_form_view_inherit" model="ir.ui.view">
+        <field name="name">hr.expense.form.inherit</field>
+        <field name="model">hr.expense</field>
+        <field name="inherit_id" ref="hr_expense.hr_expense_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='product_id']" position="after">
+                <field name="vendor_id" domain="[('supplier', '=', True)]"
+                       context="{'default_supplier': True}" groups="account.group_account_user"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>