initial commit 2

3 files changed, 224 insertions, 0 deletions

diff --git a/addons/sale_expense/tests/__init__.py b/addons/sale_expense/tests/__init__.py
new file mode 100644
index 00000000..c770fdfb
--- /dev/null
+++ b/addons/sale_expense/tests/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import test_sale_expense
+from . import test_reinvoice
diff --git a/addons/sale_expense/tests/test_reinvoice.py b/addons/sale_expense/tests/test_reinvoice.py
new file mode 100644
index 00000000..c98b8e0c
--- /dev/null
+++ b/addons/sale_expense/tests/test_reinvoice.py
@@ -0,0 +1,117 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.addons.hr_expense.tests.common import TestExpenseCommon
+from odoo.addons.sale.tests.common import TestSaleCommon
+from odoo.tests import tagged
+
+
+@tagged('-at_install', 'post_install')
+class TestReInvoice(TestExpenseCommon, TestSaleCommon):
+
+    def test_expenses_reinvoice(self):
+        (self.company_data['product_order_sales_price'] + self.company_data['product_delivery_sales_price']).write({
+            'can_be_expensed': True,
+        })
+
+        # create SO line and confirm SO (with only one line)
+        sale_order = self.env['sale.order'].with_context(mail_notrack=True, mail_create_nolog=True).create({
+            'partner_id': self.partner_a.id,
+            'partner_invoice_id': self.partner_a.id,
+            'partner_shipping_id': self.partner_a.id,
+            'order_line': [(0, 0, {
+                'name': self.company_data['product_order_sales_price'].name,
+                'product_id': self.company_data['product_order_sales_price'].id,
+                'product_uom_qty': 2.0,
+                'price_unit': 1000.0,
+            })],
+        })
+        sale_order.action_confirm()
+
+        expense_sheet = self.env['hr.expense.sheet'].create({
+            'name': 'First Expense for employee',
+            'employee_id': self.expense_employee.id,
+            'journal_id': self.company_data['default_journal_purchase'].id,
+            'accounting_date': '2017-01-01',
+            'expense_line_ids': [
+                (0, 0, {
+                    'name': 'expense_1',
+                    'date': '2016-01-01',
+                    'product_id': self.company_data['product_order_sales_price'].id,
+                    'unit_amount': self.company_data['product_order_sales_price'].list_price,
+                    'analytic_account_id': self.analytic_account_1.id,
+                    'employee_id': self.expense_employee.id,
+                    'sale_order_id': sale_order.id,
+                }),
+                (0, 0, {
+                    'name': 'expense_2',
+                    'date': '2016-01-01',
+                    'product_id': self.company_data['product_delivery_sales_price'].id,
+                    'unit_amount': self.company_data['product_delivery_sales_price'].list_price,
+                    'analytic_account_id': self.analytic_account_1.id,
+                    'employee_id': self.expense_employee.id,
+                    'sale_order_id': sale_order.id,
+                }),
+                (0, 0, {
+                    'name': 'expense_3',
+                    'date': '2016-01-01',
+                    'product_id': self.company_data['product_order_sales_price'].id,
+                    'unit_amount': self.company_data['product_order_sales_price'].list_price,
+                    'analytic_account_id': self.analytic_account_1.id,
+                    'employee_id': self.expense_employee.id,
+                    'sale_order_id': sale_order.id,
+                }),
+                (0, 0, {
+                    'name': 'expense_4',
+                    'date': '2016-01-01',
+                    'product_id': self.company_data['product_delivery_sales_price'].id,
+                    'unit_amount': self.company_data['product_delivery_sales_price'].list_price,
+                    'analytic_account_id': self.analytic_account_1.id,
+                    'employee_id': self.expense_employee.id,
+                    'sale_order_id': sale_order.id,
+                }),
+                (0, 0, {
+                    'name': 'expense_5',
+                    'date': '2016-01-01',
+                    'product_id': self.company_data['product_delivery_sales_price'].id,
+                    'unit_amount': self.company_data['product_delivery_sales_price'].list_price,
+                    'analytic_account_id': self.analytic_account_1.id,
+                    'employee_id': self.expense_employee.id,
+                    'sale_order_id': sale_order.id,
+                }),
+            ],
+        })
+
+        expense_sheet.approve_expense_sheets()
+        expense_sheet.action_sheet_move_create()
+
+        self.assertRecordValues(sale_order.order_line, [
+            # Original SO line:
+            {
+                'qty_delivered': 0.0,
+                'product_uom_qty': 2.0,
+                'is_expense': False,
+            },
+            # Expense lines:
+            {
+                'qty_delivered': 1.0,
+                'product_uom_qty': 1.0,
+                'is_expense': True,
+            },
+            {
+                'qty_delivered': 3.0,
+                'product_uom_qty': 1.0,
+                'is_expense': True,
+            },
+            {
+                'qty_delivered': 1.0,
+                'product_uom_qty': 1.0,
+                'is_expense': True,
+            },
+        ])
+
+        self.assertRecordValues(sale_order.order_line[1:], [
+            {'qty_delivered_method': 'analytic'},
+            {'qty_delivered_method': 'analytic'},
+            {'qty_delivered_method': 'analytic'},
+        ])
diff --git a/addons/sale_expense/tests/test_sale_expense.py b/addons/sale_expense/tests/test_sale_expense.py
new file mode 100644
index 00000000..cb969636
--- /dev/null
+++ b/addons/sale_expense/tests/test_sale_expense.py
@@ -0,0 +1,102 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.addons.hr_expense.tests.common import TestExpenseCommon
+from odoo.addons.sale.tests.common import TestSaleCommon
+from odoo.tests import tagged
+
+
+@tagged('post_install', '-at_install')
+class TestSaleExpense(TestExpenseCommon, TestSaleCommon):
+    
+    def test_sale_expense(self):
+        """ Test the behaviour of sales orders when managing expenses """
+
+        # create a so with a product invoiced on delivery
+        so = self.env['sale.order'].create({
+            'partner_id': self.partner_a.id,
+            'partner_invoice_id': self.partner_a.id,
+            'partner_shipping_id': self.partner_a.id,
+            'order_line': [(0, 0, {
+                'name': self.company_data['product_delivery_no'].name,
+                'product_id': self.company_data['product_delivery_no'].id,
+                'product_uom_qty': 2,
+                'product_uom': self.company_data['product_delivery_no'].uom_id.id,
+                'price_unit': self.company_data['product_delivery_no'].list_price,
+            })],
+            'pricelist_id': self.env.ref('product.list0').id,
+        })
+        so._compute_tax_id()
+        so.action_confirm()
+        so._create_analytic_account()  # normally created at so confirmation when you use the right products
+        init_price = so.amount_total
+
+        # create some expense and validate it (expense at cost)
+        # Submit to Manager
+        sheet = self.env['hr.expense.sheet'].create({
+            'name': 'Expense for John Smith',
+            'employee_id': self.expense_employee.id,
+            'journal_id': self.company_data['default_journal_purchase'].id,
+        })
+        exp = self.env['hr.expense'].create({
+            'name': 'Air Travel',
+            'product_id': self.company_data['product_delivery_cost'].id,
+            'analytic_account_id': so.analytic_account_id.id,
+            'unit_amount': 621.54,
+            'employee_id': self.expense_employee.id,
+            'sheet_id': sheet.id,
+            'sale_order_id': so.id,
+        })
+        # Approve
+        sheet.approve_expense_sheets()
+        # Create Expense Entries
+        sheet.action_sheet_move_create()
+        # expense should now be in sales order
+        self.assertIn(self.company_data['product_delivery_cost'], so.mapped('order_line.product_id'), 'Sale Expense: expense product should be in so')
+        sol = so.order_line.filtered(lambda sol: sol.product_id.id == self.company_data['product_delivery_cost'].id)
+        self.assertEqual((sol.price_unit, sol.qty_delivered), (621.54, 1.0), 'Sale Expense: error when invoicing an expense at cost')
+        self.assertEqual(so.amount_total, init_price + sol.price_unit, 'Sale Expense: price of so should be updated after adding expense')
+
+        # create some expense and validate it (expense at sale price)
+        init_price = so.amount_total
+        prod_exp_2 = self.env['product.product'].create({
+            'name': 'Car Travel',
+            'expense_policy': 'sales_price',
+            'type': 'service',
+            'can_be_expensed': True,
+            'invoice_policy': 'delivery',
+            'list_price': 0.50,
+            'uom_id': self.env.ref('uom.product_uom_km').id,
+            'uom_po_id': self.env.ref('uom.product_uom_km').id,
+        })
+        # Submit to Manager
+        sheet = self.env['hr.expense.sheet'].create({
+            'name': 'Expense for John Smith',
+            'employee_id': self.expense_employee.id,
+            'journal_id': self.company_data['default_journal_purchase'].id,
+        })
+        exp = self.env['hr.expense'].create({
+            'name': 'Car Travel',
+            'product_id': prod_exp_2.id,
+            'analytic_account_id': so.analytic_account_id.id,
+            'product_uom_id': self.env.ref('uom.product_uom_km').id,
+            'unit_amount': 0.15,
+            'quantity': 100,
+            'employee_id': self.expense_employee.id,
+            'sheet_id': sheet.id,
+            'sale_order_id': so.id,
+        })
+        # Approve
+        sheet.approve_expense_sheets()
+        # Create Expense Entries
+        sheet.action_sheet_move_create()
+        # expense should now be in sales order
+        self.assertIn(prod_exp_2, so.mapped('order_line.product_id'), 'Sale Expense: expense product should be in so')
+        sol = so.order_line.filtered(lambda sol: sol.product_id.id == prod_exp_2.id)
+        self.assertEqual((sol.price_unit, sol.qty_delivered), (prod_exp_2.list_price, 100.0), 'Sale Expense: error when invoicing an expense at cost')
+        self.assertEqual(so.amount_untaxed, init_price + (prod_exp_2.list_price * 100.0), 'Sale Expense: price of so should be updated after adding expense')
+        # self.assertTrue(so.invoice_status, 'no', 'Sale Expense: expenses should not impact the invoice_status of the so')
+
+        # both expenses should be invoiced
+        inv = so._create_invoices()
+        self.assertEqual(inv.amount_untaxed, 621.54 + (prod_exp_2.list_price * 100.0), 'Sale Expense: invoicing of expense is wrong')