Touati Djamel (otd)
8f6e85f752
Steps to reproduce the bug: - Install Accounting and Expense app - Go to accounting settings > enable cash basis option - Go to accounting > configuration > accounting > taxes - Create a new tax or choose an existing one e.g “Tax abc”: Tax Computation = `”Percentage of Price”` Tax Type = `”Purchases”` Choose any value for amount Select "Based on Payment" in tax due choose an account with the "Allow Reconciliation" option activated in the Cash Basis Transition Account field Save - Go to expenses > Expense Reports > All reports > Create a new one : - Add 2 expense and for both set up the taxes to "Tax abc" and unit price > 0 - Submit to manager - Approve - Post journal entries - Register a payment Problem: A user error with the following message is triggered: “You are trying to reconcile some entries that are already reconciled” In the use case we have two expenses and for each, an `" account.partial.reconcile "` will be created, so we will loop twice and therefore add twice all the `”account.move.line”` linked to the taxes in the dict `" to_reconcile_after "`: https://github.com/odoo/odoo/blob/beccf82e09d536255d9d9cb9bfe58ebae2559843/addons/account/models/account_partial_reconcile.py#L585 Then we loop to reconcile all the `" account.move.line "` which are in the dict `" to_reconcile_after "`, but since we added them all twice, at each turn of the loop we give them all as a parameter of the “reconcile” function without checking whether they are already reconciled or not. opw-2565934 closes odoo/odoo#74432 X-original-commit: fb2b1482f5d3dec924b08e08dc915d6608c7d6b3 Signed-off-by: Laurent Smet <smetl@users.noreply.github.com> Signed-off-by: Djamel Touati <DjamelTouati@users.noreply.github.com>
280 lines
12 KiB
Python
280 lines
12 KiB
Python
# -*- 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.tests import tagged, Form
|
|
from odoo import fields
|
|
|
|
|
|
@tagged('-at_install', 'post_install')
|
|
class TestExpenses(TestExpenseCommon):
|
|
|
|
def test_expense_sheet_payment_state(self):
|
|
''' Test expense sheet payment states when partially paid, in payment and paid. '''
|
|
|
|
def get_payment(expense_sheet, amount):
|
|
ctx = {'active_model': 'account.move', 'active_ids': expense_sheet.account_move_id.ids}
|
|
payment_register = self.env['account.payment.register'].with_context(**ctx).create({
|
|
'amount': amount,
|
|
'journal_id': self.company_data['default_journal_bank'].id,
|
|
'payment_method_line_id': self.inbound_payment_method_line.id,
|
|
})
|
|
return payment_register._create_payments()
|
|
|
|
expense_sheet = self.env['hr.expense.sheet'].create({
|
|
'name': 'Expense for John Smith',
|
|
'employee_id': self.expense_employee.id,
|
|
'accounting_date': '2021-01-01',
|
|
'expense_line_ids': [(0, 0, {
|
|
'name': 'Car Travel Expenses',
|
|
'employee_id': self.expense_employee.id,
|
|
'product_id': self.product_a.id,
|
|
'unit_amount': 350.00,
|
|
})]
|
|
})
|
|
|
|
expense_sheet.action_submit_sheet()
|
|
expense_sheet.approve_expense_sheets()
|
|
expense_sheet.action_sheet_move_create()
|
|
|
|
payment = get_payment(expense_sheet, 100.0)
|
|
liquidity_lines1 = payment._seek_for_lines()[0]
|
|
|
|
self.assertEqual(expense_sheet.payment_state, 'partial', 'payment_state should be partial')
|
|
|
|
payment = get_payment(expense_sheet, 250.0)
|
|
liquidity_lines2 = payment._seek_for_lines()[0]
|
|
|
|
in_payment_state = expense_sheet.account_move_id._get_invoice_in_payment_state()
|
|
self.assertEqual(expense_sheet.payment_state, in_payment_state, 'payment_state should be ' + in_payment_state)
|
|
|
|
statement = self.env['account.bank.statement'].create({
|
|
'name': 'test_statement',
|
|
'journal_id': self.company_data['default_journal_bank'].id,
|
|
'line_ids': [
|
|
(0, 0, {
|
|
'payment_ref': 'pay_ref',
|
|
'amount': -350.0,
|
|
'partner_id': self.expense_employee.address_home_id.id,
|
|
}),
|
|
],
|
|
})
|
|
statement.button_post()
|
|
statement.line_ids.reconcile([{'id': liquidity_lines1.id}, {'id': liquidity_lines2.id}])
|
|
|
|
self.assertEqual(expense_sheet.payment_state, 'paid', 'payment_state should be paid')
|
|
|
|
def test_expense_values(self):
|
|
""" Checking accounting move entries and analytic entries when submitting expense """
|
|
|
|
# The expense employee is able to a create an expense sheet.
|
|
# The total should be 1725.0 because:
|
|
# - first line: 1000.0 (unit amount) + 150.0 (tax) = 1150.0
|
|
# - second line: (1500.0 (unit amount) + 225.0 (tax)) * 1/3 (rate) = 575.0.
|
|
|
|
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, {
|
|
# Expense without foreign currency.
|
|
'name': 'expense_1',
|
|
'date': '2016-01-01',
|
|
'product_id': self.product_a.id,
|
|
'unit_amount': 1000.0,
|
|
'tax_ids': [(6, 0, self.company_data['default_tax_purchase'].ids)],
|
|
'analytic_account_id': self.analytic_account_1.id,
|
|
'employee_id': self.expense_employee.id,
|
|
}),
|
|
(0, 0, {
|
|
# Expense with foreign currency (rate 1:3).
|
|
'name': 'expense_1',
|
|
'date': '2016-01-01',
|
|
'product_id': self.product_b.id,
|
|
'unit_amount': 1500.0,
|
|
'tax_ids': [(6, 0, self.company_data['default_tax_purchase'].ids)],
|
|
'analytic_account_id': self.analytic_account_2.id,
|
|
'currency_id': self.currency_data['currency'].id,
|
|
'employee_id': self.expense_employee.id,
|
|
}),
|
|
],
|
|
})
|
|
|
|
# Check expense sheet values.
|
|
self.assertRecordValues(expense_sheet, [{'state': 'draft', 'total_amount': 1725.0}])
|
|
|
|
expense_sheet.action_submit_sheet()
|
|
expense_sheet.approve_expense_sheets()
|
|
expense_sheet.action_sheet_move_create()
|
|
|
|
# Check expense sheet journal entry values.
|
|
self.assertRecordValues(expense_sheet.account_move_id.line_ids.sorted('balance'), [
|
|
# Receivable line (company currency):
|
|
{
|
|
'debit': 0.0,
|
|
'credit': 1150.0,
|
|
'amount_currency': -1150.0,
|
|
'account_id': self.company_data['default_account_payable'].id,
|
|
'product_id': False,
|
|
'currency_id': self.company_data['currency'].id,
|
|
'tax_line_id': False,
|
|
'analytic_account_id': False,
|
|
},
|
|
# Receivable line (foreign currency):
|
|
{
|
|
'debit': 0.0,
|
|
'credit': 862.5,
|
|
'amount_currency': -1725.0,
|
|
'account_id': self.company_data['default_account_payable'].id,
|
|
'product_id': False,
|
|
'currency_id': self.currency_data['currency'].id,
|
|
'tax_line_id': False,
|
|
'analytic_account_id': False,
|
|
},
|
|
# Tax line (foreign currency):
|
|
{
|
|
'debit': 112.5,
|
|
'credit': 0.0,
|
|
'amount_currency': 225.0,
|
|
'account_id': self.company_data['default_account_tax_purchase'].id,
|
|
'product_id': False,
|
|
'currency_id': self.currency_data['currency'].id,
|
|
'tax_line_id': self.company_data['default_tax_purchase'].id,
|
|
'analytic_account_id': False,
|
|
},
|
|
# Tax line (company currency):
|
|
{
|
|
'debit': 150.0,
|
|
'credit': 0.0,
|
|
'amount_currency': 150.0,
|
|
'account_id': self.company_data['default_account_tax_purchase'].id,
|
|
'product_id': False,
|
|
'currency_id': self.company_data['currency'].id,
|
|
'tax_line_id': self.company_data['default_tax_purchase'].id,
|
|
'analytic_account_id': False,
|
|
},
|
|
# Product line (foreign currency):
|
|
{
|
|
'debit': 750.0,
|
|
'credit': 0.0,
|
|
'amount_currency': 1500.0,
|
|
'account_id': self.company_data['default_account_expense'].id,
|
|
'product_id': self.product_b.id,
|
|
'currency_id': self.currency_data['currency'].id,
|
|
'tax_line_id': False,
|
|
'analytic_account_id': self.analytic_account_2.id,
|
|
},
|
|
# Product line (company currency):
|
|
{
|
|
'debit': 1000.0,
|
|
'credit': 0.0,
|
|
'amount_currency': 1000.0,
|
|
'account_id': self.company_data['default_account_expense'].id,
|
|
'product_id': self.product_a.id,
|
|
'currency_id': self.company_data['currency'].id,
|
|
'tax_line_id': False,
|
|
'analytic_account_id': self.analytic_account_1.id,
|
|
},
|
|
])
|
|
|
|
# Check expense analytic lines.
|
|
self.assertRecordValues(expense_sheet.account_move_id.line_ids.analytic_line_ids.sorted('amount'), [
|
|
{
|
|
'amount': -1000.0,
|
|
'date': fields.Date.from_string('2017-01-01'),
|
|
'account_id': self.analytic_account_1.id,
|
|
'currency_id': self.company_data['currency'].id,
|
|
},
|
|
{
|
|
'amount': -750.0,
|
|
'date': fields.Date.from_string('2017-01-01'),
|
|
'account_id': self.analytic_account_2.id,
|
|
'currency_id': self.company_data['currency'].id,
|
|
},
|
|
])
|
|
|
|
def test_expenses_with_tax_and_lockdate(self):
|
|
''' Test creating a journal entry for multiple expenses using taxes. A lock date is set in order to trigger
|
|
the recomputation of the taxes base amount.
|
|
'''
|
|
self.env.company.tax_lock_date = '2020-02-01'
|
|
|
|
expense = self.env['hr.expense.sheet'].create({
|
|
'name': 'Expense for John Smith',
|
|
'employee_id': self.expense_employee.id,
|
|
'accounting_date': '2020-01-01'
|
|
})
|
|
|
|
for i in range(2):
|
|
expense_line = self.env['hr.expense'].create({
|
|
'name': 'Car Travel Expenses',
|
|
'employee_id': self.expense_employee.id,
|
|
'product_id': self.product_a.id,
|
|
'unit_amount': 350.00,
|
|
'tax_ids': [(6, 0, [self.tax_purchase_a.id])],
|
|
'sheet_id': expense.id,
|
|
'analytic_account_id': self.analytic_account_1.id,
|
|
})
|
|
expense_line._onchange_product_id_date_account_id()
|
|
|
|
expense.action_submit_sheet()
|
|
expense.approve_expense_sheets()
|
|
|
|
# Assert not "Cannot create unbalanced journal entry" error.
|
|
expense.action_sheet_move_create()
|
|
|
|
def test_reconcile_payment(self):
|
|
tax = self.env['account.tax'].create({
|
|
'name': 'tax abc',
|
|
'type_tax_use': 'purchase',
|
|
'amount_type': 'percent',
|
|
'amount': 15,
|
|
'price_include': False,
|
|
'include_base_amount': False,
|
|
'tax_exigibility': 'on_payment'
|
|
})
|
|
current_assets_type = self.env.ref('account.data_account_type_current_assets')
|
|
company = self.env.company.id
|
|
tax.cash_basis_transition_account_id = self.env['account.account'].create({
|
|
'name': "test",
|
|
'code': 999991,
|
|
'reconcile': True,
|
|
'user_type_id': current_assets_type.id,
|
|
'company_id': company,
|
|
}).id
|
|
|
|
sheet = self.env['hr.expense.sheet'].create({
|
|
'company_id': company,
|
|
'employee_id': self.expense_employee.id,
|
|
'name': 'test sheet',
|
|
'expense_line_ids': [
|
|
(0, 0, {
|
|
'name': 'expense_1',
|
|
'date': '2016-01-01',
|
|
'product_id': self.product_a.id,
|
|
'unit_amount': 10.0,
|
|
'employee_id': self.expense_employee.id,
|
|
'tax_ids': tax
|
|
}),
|
|
(0, 0, {
|
|
'name': 'expense_2',
|
|
'date': '2016-01-01',
|
|
'product_id': self.product_a.id,
|
|
'unit_amount': 1.0,
|
|
'employee_id': self.expense_employee.id,
|
|
'tax_ids': tax
|
|
}),
|
|
],
|
|
})
|
|
|
|
|
|
#actions
|
|
sheet.action_submit_sheet()
|
|
sheet.approve_expense_sheets()
|
|
sheet.action_sheet_move_create()
|
|
action_data = sheet.action_register_payment()
|
|
wizard = Form(self.env['account.payment.register'].with_context(action_data['context'])).save()
|
|
wizard.action_create_payments()
|
|
self.assertEqual(sheet.state, 'done', 'all account.move.line linked to expenses must be reconciled after payment')
|