19.0 vanilla

This commit is contained in:
Ernad Husremovic 2026-03-09 09:32:12 +01:00
parent 79f83631d5
commit 73afc09215
6267 changed files with 1534193 additions and 1130106 deletions

View file

@ -15,7 +15,7 @@ class TestReInvoice(TestExpenseCommon, TestSaleCommon):
- When posting the move of an expense, it creates the corresponding SOLs with the correct expense quantity
- The amount of analytic account linked do not impact the quantities on the SOLs
- The quantities ordered and delivered are reset to 0 when:
- the expense sheet move has been reset to draft
- the expense move has been reset to draft
- the expense move is reversed
- the expense move has been reset to draft
- As it should be a one-to-one relation between model, we need to ensure that one expense only impacts one SOL
@ -23,25 +23,37 @@ class TestReInvoice(TestExpenseCommon, TestSaleCommon):
"""
@classmethod
def setUpClass(cls, chart_template_ref=None):
super().setUpClass(chart_template_ref=chart_template_ref)
def setUpClass(cls):
super().setUpClass()
new_sale_tax, new_purchase_tax = cls.env['account.tax'].create([{
'name': 'Tax 12.499%',
'amount': 12.499,
'amount_type': 'percent',
'type_tax_use': tax_type,
'repartition_line_ids': [
Command.create({'document_type': 'invoice', 'repartition_type': 'base'}),
Command.create({
'document_type': 'invoice',
'repartition_type': 'tax',
'account_id': cls.company_data[f'default_account_tax_{tax_type}'].id
}),
Command.create({'document_type': 'refund', 'repartition_type': 'base'}),
Command.create({
'document_type': 'refund',
'repartition_type': 'tax',
'account_id': cls.company_data[f'default_account_tax_{tax_type}'].id
}),
],
} for tax_type in ('sale', 'purchase')])
cls.company_data.update({
'service_order_sales_price': cls.env['product.product'].with_company(cls.company_data['company']).create({
'name': 'service_order_sales_price',
'categ_id': cls.company_data['product_category'].id,
'categ_id': cls.product_category.id,
'standard_price': 0.,
'list_price': 280.39,
'type': 'service',
'weight': 0.01,
'uom_id': cls.env.ref('uom.product_uom_unit').id,
'uom_po_id': cls.env.ref('uom.product_uom_unit').id,
'default_code': 'FURN_99991',
'invoice_policy': 'order',
'expense_policy': 'sales_price',
@ -51,13 +63,12 @@ class TestReInvoice(TestExpenseCommon, TestSaleCommon):
}),
'service_delivery_sales_price': cls.env['product.product'].with_company(cls.company_data['company']).create({
'name': 'service_order_sales_price',
'categ_id': cls.company_data['product_category'].id,
'categ_id': cls.product_category.id,
'standard_price': 0.,
'list_price': 280.39,
'type': 'service',
'weight': 0.01,
'uom_id': cls.env.ref('uom.product_uom_unit').id,
'uom_po_id': cls.env.ref('uom.product_uom_unit').id,
'default_code': 'FURN_99992',
'invoice_policy': 'delivery',
'expense_policy': 'sales_price',
@ -67,13 +78,12 @@ class TestReInvoice(TestExpenseCommon, TestSaleCommon):
}),
'service_delivery_cost_price': cls.env['product.product'].with_company(cls.company_data['company']).create({
'name': 'service_delivery_cost_price',
'categ_id': cls.company_data['product_category'].id,
'categ_id': cls.product_category.id,
'standard_price': 235.28,
'list_price': 280.39,
'type': 'service',
'weight': 0.01,
'uom_id': cls.env.ref('uom.product_uom_unit').id,
'uom_po_id': cls.env.ref('uom.product_uom_unit').id,
'default_code': 'FURN_99993',
'invoice_policy': 'delivery',
'expense_policy': 'cost',
@ -83,13 +93,12 @@ class TestReInvoice(TestExpenseCommon, TestSaleCommon):
}),
'service_order_cost_price': cls.env['product.product'].with_company(cls.company_data['company']).create({
'name': 'service_order_cost_price',
'categ_id': cls.company_data['product_category'].id,
'categ_id': cls.product_category.id,
'standard_price': 235.28,
'list_price': 280.39,
'type': 'service',
'weight': 0.01,
'uom_id': cls.env.ref('uom.product_uom_unit').id,
'uom_po_id': cls.env.ref('uom.product_uom_unit').id,
'default_code': 'FURN_99994',
'invoice_policy': 'order',
'expense_policy': 'cost',
@ -113,298 +122,292 @@ class TestReInvoice(TestExpenseCommon, TestSaleCommon):
})
cls.expense_sale_order.action_confirm()
# Create an expense sheet with 6 expenses, covering all the expense & invoicing policies combinaisons
cls.sale_expenses = cls.env['hr.expense'].create([
{
# exp_order_sale_1
'name': 'expense_1 invoicing=order, expense=sales_price',
'date': '2016-01-01',
'product_id': cls.company_data['service_order_sales_price'].id,
'total_amount': 100.34,
'analytic_distribution': {cls.analytic_account_1.id: 100},
'employee_id': cls.expense_employee.id,
'sale_order_id': cls.expense_sale_order.id,
},
{
# exp_order_sale_2
'name': 'expense_2 invoicing=order, expense=sales_price',
'date': '2016-01-02',
'product_id': cls.company_data['service_order_sales_price'].id,
'total_amount': 100.21,
'employee_id': cls.expense_employee.id,
'sale_order_id': cls.expense_sale_order.id,
},
{
# exp_deliv_sale_3
'name': 'expense_3 invoicing=delivery, expense=sales_price',
'date': '2016-01-03',
'product_id': cls.company_data['service_delivery_sales_price'].id,
'total_amount': 10012.49,
'analytic_distribution': {cls.analytic_account_1.id: 100},
'employee_id': cls.expense_employee.id,
'sale_order_id': cls.expense_sale_order.id,
},
{
# exp_deliv_sale_4
'name': 'expense_4 invoicing=delivery, expense=sales_price',
'date': '2016-01-03',
'product_id': cls.company_data['service_delivery_sales_price'].id,
'analytic_distribution': {cls.analytic_account_1.id: 100},
'total_amount': 10012.49,
'employee_id': cls.expense_employee.id,
'sale_order_id': cls.expense_sale_order.id,
},
{
# exp_deliv_cost_5
'name': 'expense_5 invoicing=delivery, expense=cost',
'date': '2016-01-03',
'product_id': cls.company_data['service_delivery_cost_price'].id,
'quantity': 5,
'employee_id': cls.expense_employee.id,
'sale_order_id': cls.expense_sale_order.id,
},
{
# exp_order_cost_6
'name': 'expense_6 invoicing=order, expense=cost',
'date': '2016-01-03',
'product_id': cls.company_data['service_order_cost_price'].id,
'quantity': 6,
'employee_id': cls.expense_employee.id,
'sale_order_id': cls.expense_sale_order.id,
},
]).sorted()
cls.sale_expense_sheet = cls.env['hr.expense.sheet'].create({
'name': 'Reset expense test',
# Create 6 expenses, covering all the expense & invoicing policies combinaisons
cls.sale_exp_order_sale_1 = cls.create_expenses({
'name': 'expense_1 invoicing=order, expense=sales_price',
'date': '2016-01-01',
'product_id': cls.company_data['service_order_sales_price'].id,
'total_amount': 100.34,
'analytic_distribution': {cls.analytic_account_1.id: 100},
'employee_id': cls.expense_employee.id,
'journal_id': cls.company_data['default_journal_purchase'].id,
'accounting_date': '2017-01-01',
'expense_line_ids': [Command.set(cls.sale_expenses.ids)],
'sale_order_id': cls.expense_sale_order.id,
})
cls.sale_expense_sheet._do_approve()
cls.sale_exp_order_sale_2 = cls.create_expenses({
'name': 'expense_2 invoicing=order, expense=sales_price',
'date': '2016-01-02',
'product_id': cls.company_data['service_order_sales_price'].id,
'total_amount': 100.21,
'sale_order_id': cls.expense_sale_order.id,
})
cls.sale_exp_deliv_sale_3 = cls.create_expenses({
'name': 'expense_3 invoicing=delivery, expense=sales_price',
'date': '2016-01-03',
'product_id': cls.company_data['service_delivery_sales_price'].id,
'total_amount': 10012.49,
'analytic_distribution': {cls.analytic_account_1.id: 100},
'sale_order_id': cls.expense_sale_order.id,
})
cls.sale_exp_deliv_sale_4 = cls.create_expenses({
'name': 'expense_4 invoicing=delivery, expense=sales_price',
'date': '2016-01-03',
'product_id': cls.company_data['service_delivery_sales_price'].id,
'analytic_distribution': {cls.analytic_account_1.id: 100},
'total_amount': 10012.49,
'sale_order_id': cls.expense_sale_order.id,
})
cls.sale_exp_deliv_cost_5 = cls.create_expenses({
'name': 'expense_5 invoicing=delivery, expense=cost',
'date': '2016-01-03',
'product_id': cls.company_data['service_delivery_cost_price'].id,
'quantity': 5,
'sale_order_id': cls.expense_sale_order.id,
})
cls.sale_exp_order_cost_6 = cls.create_expenses({
'name': 'expense_6 invoicing=order, expense=cost',
'date': '2016-01-03',
'product_id': cls.company_data['service_order_cost_price'].id,
'quantity': 6,
'sale_order_id': cls.expense_sale_order.id,
},
)
cls.sale_expense_all = (
cls.sale_exp_order_sale_1
| cls.sale_exp_order_sale_2
| cls.sale_exp_deliv_sale_3
| cls.sale_exp_deliv_sale_4
| cls.sale_exp_deliv_cost_5
| cls.sale_exp_order_cost_6
)
cls.sale_expense_all.action_submit()
cls.sale_expense_all._do_approve() # Skip duplicate wizard
def test_expenses_reinvoice_case_1_create_moves(self):
"""
CASE 1: Creation of the expense sheets moves. The sale order lines are created.
CASE 1: Creation of the expenses moves. The sale order lines are created.
"""
# pylint: disable=bad-whitespace
self.sale_expense_sheet.action_sheet_move_create()
self.post_expenses_with_wizard(self.sale_expense_all)
self.assertRecordValues(self.expense_sale_order.order_line, [
# [0] Line not created from a re-invoiced, should never be changed
{'qty_delivered': 0.0, 'product_uom_qty': 3.0, 'is_expense': False, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
# [1-6] SHEET 1 Lines: created with the correct quantities and linked to the expense
{'qty_delivered': 6.0, 'product_uom_qty': 6.0, 'is_expense': True, 'name': 'expense_employee: expense_6 invoicing=order, expense=cost'}, # noqa: E272
{'qty_delivered': 5.0, 'product_uom_qty': 5.0, 'is_expense': True, 'name': 'expense_employee: expense_5 invoicing=delivery, expense=cost'}, # noqa: E272
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'is_expense': True, 'name': 'expense_employee: expense_4 invoicing=delivery, expense=sales_price'}, # noqa: E272
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'is_expense': True, 'name': 'expense_employee: expense_3 invoicing=delivery, expense=sales_price'}, # noqa: E272
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'is_expense': True, 'name': 'expense_employee: expense_2 invoicing=order, expense=sales_price'}, # noqa: E272
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'is_expense': True, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'}, # noqa: E272
{'qty_delivered': 0.0, 'product_uom_qty': 3.0, 'is_expense': False, 'expense_ids': []},
# [1-6] Expenses Lines: created with the correct quantities and linked to the expense
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'is_expense': True, 'expense_ids': [self.sale_exp_order_sale_1.id]},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'is_expense': True, 'expense_ids': [self.sale_exp_order_sale_2.id]},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'is_expense': True, 'expense_ids': [self.sale_exp_deliv_sale_3.id]},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'is_expense': True, 'expense_ids': [self.sale_exp_deliv_sale_4.id]},
{'qty_delivered': 5.0, 'product_uom_qty': 5.0, 'is_expense': True, 'expense_ids': [self.sale_exp_deliv_cost_5.id]},
{'qty_delivered': 6.0, 'product_uom_qty': 6.0, 'is_expense': True, 'expense_ids': [self.sale_exp_order_cost_6.id]},
])
def test_expenses_reinvoice_case_2_reset_sheet_to_draft(self):
def test_expenses_reinvoice_case_2_reset_expense_to_draft(self):
"""
CASE 2: Reset to draft of the expense sheet, the quantities of the corresponding SOL are set to 0
CASE 2: Reset to draft of the expenses, the quantities of the corresponding SOL are set to 0
"""
# CASE 1 steps
self.sale_expense_sheet.action_sheet_move_create()
self.post_expenses_with_wizard(self.sale_expense_all)
# CASE 2 steps
self.sale_expense_sheet.action_unpost()
self.sale_expense_all.account_move_id.button_draft()
self.sale_expense_all.account_move_id.unlink()
self.sale_expense_all.action_reset()
self.assertRecordValues(self.expense_sale_order.order_line, [
# [0] Line not created from a re-invoiced, should never be changed
{'qty_delivered': 0.0, 'product_uom_qty': 3.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
# [1-6] SHEET Lines: quantities are reset to 0 and expenses are unlinked
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_6 invoicing=order, expense=cost'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_5 invoicing=delivery, expense=cost'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_4 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_3 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_2 invoicing=order, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 3.0, 'expense_ids': []},
# [1-6] Expense Lines: quantities are reset to 0 and expenses are unlinked
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
])
def test_expenses_reinvoice_case_3_recreate_move_after_reset(self):
"""
CASE 3: Re-Approve and Re-Post the expense sheet after a reset, creating new SOLs with the correct quantities
CASE 3: Re-Approve and Re-Post the expense after a reset, creating new SOLs with the correct quantities
"""
# CASE 1 steps
self.sale_expense_sheet.action_sheet_move_create()
self.post_expenses_with_wizard(self.sale_expense_all)
# CASE 2 steps
self.sale_expense_sheet.action_unpost()
self.sale_expense_all.account_move_id.button_draft()
self.sale_expense_all.account_move_id.unlink()
self.sale_expense_all.action_reset()
# CASE 3 steps
self.sale_expense_sheet._do_approve()
self.sale_expense_sheet.action_sheet_move_create()
self.sale_expense_all.action_submit()
self.sale_expense_all._do_approve() # Skip duplicate wizard
self.post_expenses_with_wizard(self.sale_expense_all)
self.assertRecordValues(self.expense_sale_order.order_line, [
# [0] Line not created from a re-invoiced, should never be changed
{'qty_delivered': 0.0, 'product_uom_qty': 3.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
# [1-6] SHEET CASE 2 Lines: no change
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_6 invoicing=order, expense=cost'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_5 invoicing=delivery, expense=cost'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_4 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_3 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_2 invoicing=order, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
# [7-12] SHEET CASE 3 Lines: created with the correct quantities and linked to the expense
{'qty_delivered': 6.0, 'product_uom_qty': 6.0, 'name': 'expense_employee: expense_6 invoicing=order, expense=cost'},
{'qty_delivered': 5.0, 'product_uom_qty': 5.0, 'name': 'expense_employee: expense_5 invoicing=delivery, expense=cost'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_4 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_3 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_2 invoicing=order, expense=sales_price'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 3.0, 'expense_ids': []},
# [1-6] CASE 2 Lines: no change
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
# [7-12] CASE 3 Lines: created with the correct quantities and linked to the expense
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [self.sale_exp_order_sale_1.id]},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [self.sale_exp_order_sale_2.id]},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [self.sale_exp_deliv_sale_3.id]},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [self.sale_exp_deliv_sale_4.id]},
{'qty_delivered': 5.0, 'product_uom_qty': 5.0, 'expense_ids': [self.sale_exp_deliv_cost_5.id]},
{'qty_delivered': 6.0, 'product_uom_qty': 6.0, 'expense_ids': [self.sale_exp_order_cost_6.id]},
])
def test_expenses_reinvoice_case_4_reset_sheet_move_to_draft(self):
def test_expenses_reinvoice_case_4_reset_expense_move_to_draft(self):
"""
CASE 4: Reset to draft of the expense sheet's move, the quantities of the corresponding SOL are set to 0
CASE 4: Reset to draft of the expenses move, the quantities of the corresponding SOL are set to 0
"""
# CASE 1 steps
self.sale_expense_sheet.action_sheet_move_create()
self.post_expenses_with_wizard(self.sale_expense_all)
# CASE 4 steps
self.sale_expense_sheet.account_move_id.button_draft()
self.sale_expense_all.account_move_id.button_draft()
self.assertRecordValues(self.expense_sale_order.order_line, [
# [0] Line not created from a re-invoiced, should never be changed
{'qty_delivered': 0.0, 'product_uom_qty': 3.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
# [1-6] SHEET Lines: quantities are reset to 0 and expenses are unlinked
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_6 invoicing=order, expense=cost'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_5 invoicing=delivery, expense=cost'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_4 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_3 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_2 invoicing=order, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 3.0, 'expense_ids': []},
# [1-6] EXPENSES Lines: quantities are reset to 0 and expenses are unlinked
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
])
def test_expenses_reinvoice_case_5_repost_sheet_move_after_reset_to_draft(self):
def test_expenses_reinvoice_case_5_repost_expense_move_after_reset_to_draft(self):
"""
CASE 5: Re-Post the expense sheet's move, creating new SOLs with the correct quantities
CASE 5: Re-Post the expenses move, creating new SOLs with the correct quantities
"""
# CASE 1 steps
self.sale_expense_sheet.action_sheet_move_create()
self.post_expenses_with_wizard(self.sale_expense_all)
# CASE 4 steps
self.sale_expense_sheet.account_move_id.button_draft()
self.sale_expense_all.account_move_id.button_draft()
# CASE 5 steps
self.sale_expense_sheet.account_move_id.action_post()
self.sale_expense_all.account_move_id.action_post()
self.assertRecordValues(self.expense_sale_order.order_line, [
# [0] Line not created from a re-invoiced, should never be changed
{'qty_delivered': 0.0, 'product_uom_qty': 3.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
# [1-6] SHEET CASE 4 Lines: no change
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_6 invoicing=order, expense=cost'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_5 invoicing=delivery, expense=cost'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_4 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_3 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_2 invoicing=order, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
# [7-12] SHEET CASE 5 Lines: created with the correct quantities and linked to the expense
{'qty_delivered': 6.0, 'product_uom_qty': 6.0, 'name': 'expense_employee: expense_6 invoicing=order, expense=cost'},
{'qty_delivered': 5.0, 'product_uom_qty': 5.0, 'name': 'expense_employee: expense_5 invoicing=delivery, expense=cost'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_4 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_3 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_2 invoicing=order, expense=sales_price'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 3.0, 'expense_ids': []},
# [1-6] EXPENSE CASE 4 Lines: no change
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
# [7-12] EXPENSE CASE 5 Lines: created with the correct quantities and linked to the expense
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [self.sale_exp_order_sale_1.id]},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [self.sale_exp_order_sale_2.id]},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [self.sale_exp_deliv_sale_3.id]},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [self.sale_exp_deliv_sale_4.id]},
{'qty_delivered': 5.0, 'product_uom_qty': 5.0, 'expense_ids': [self.sale_exp_deliv_cost_5.id]},
{'qty_delivered': 6.0, 'product_uom_qty': 6.0, 'expense_ids': [self.sale_exp_order_cost_6.id]},
])
def test_expenses_reinvoice_case_6_reverse_expense_move(self):
"""
CASE 6: Reverse the expense sheet's move, the quantities of the corresponding SOL are reset to 0
CASE 6: Reverse the expenses move, the quantities of the corresponding SOL are reset to 0
"""
# CASE 1 steps
self.sale_expense_sheet.action_sheet_move_create()
self.post_expenses_with_wizard(self.sale_expense_all)
# CASE 6 steps
self.sale_expense_sheet.account_move_id._reverse_moves()
self.sale_expense_all.account_move_id._reverse_moves()
self.assertRecordValues(self.expense_sale_order.order_line, [
# [0] Line not created from a re-invoiced, should never be changed
{'qty_delivered': 0.0, 'product_uom_qty': 3.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
# [1-6] SHEET Lines: quantities are reset to 0 and expenses are unlinked
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_6 invoicing=order, expense=cost'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_5 invoicing=delivery, expense=cost'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_4 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_3 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_2 invoicing=order, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 3.0, 'expense_ids': []},
# [1-6] EXPENSE Lines: quantities are reset to 0 and expenses are unlinked
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
])
def test_expenses_reinvoice_case_7_ensure_one2one_relationship(self):
"""
CASE 7: Test that two exact same sols are not reset to 0 when the expense of one of them is resetting the quantities to 0
CASE 7: Test that two exact same sols are not both reset to 0 when the expense of one of them is resetting the quantities to 0
"""
original_expenses = self.sale_expenses
self.sale_expense_sheet.write({
'expense_line_ids': [Command.link(expense.copy().id) for expense in original_expenses], # Duplicates of the expenses IN the reset sheet
'accounting_date': '2017-01-01', # To avoid "duplicate vendor reference raised" in the move
})
self.sale_expense_sheet._do_approve()
self.sale_expense_sheet.action_sheet_move_create()
sheet_2 = self.sale_expense_sheet.copy({
'expense_line_ids': [Command.set([expense.copy().id for expense in original_expenses])], # Duplicates of the expenses OUTSIDE the reset sheet
'accounting_date': '2017-01-02',
})
sheet_2._do_approve()
sheet_2.action_sheet_move_create()
# For every expense, we duplicate it.
# - the former will be linked to the same sol
# - the latter will go on a different
sale_exp_order_sale_1_copy = self.sale_exp_order_sale_1.copy()
sale_exp_order_sale_2_copy = self.sale_exp_order_sale_2.copy()
sale_exp_deliv_sale_3_copy = self.sale_exp_deliv_sale_3.copy()
sale_exp_deliv_sale_4_copy = self.sale_exp_deliv_sale_4.copy()
sale_exp_deliv_cost_5_copy = self.sale_exp_deliv_cost_5.copy()
sale_exp_order_cost_6_copy = self.sale_exp_order_cost_6.copy()
sale_expense_copies_all = (
sale_exp_order_sale_1_copy
| sale_exp_order_sale_2_copy
| sale_exp_deliv_sale_3_copy
| sale_exp_deliv_sale_4_copy
| sale_exp_deliv_cost_5_copy
| sale_exp_order_cost_6_copy
)
sale_expense_original_all = self.sale_expense_all
self.sale_expense_all |= sale_expense_copies_all
sale_expense_copies_all.action_submit()
sale_expense_copies_all._do_approve() # Skip duplicate wizard
self.post_expenses_with_wizard(sale_expense_original_all)
self.post_expenses_with_wizard(sale_expense_copies_all) # To ensure there are two different moves
# Check that all the expenses can be found on the sale order
self.assertRecordValues(self.expense_sale_order.order_line, [
# [0] Line not created from a re-invoiced, should never be changed
{'qty_delivered': 0.0, 'product_uom_qty': 3.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
# [1-12] SHEET 1 Lines: Created with the correct quantities
{'qty_delivered': 6.0, 'product_uom_qty': 6.0, 'name': 'expense_employee: expense_6 invoicing=order, expense=cost'},
{'qty_delivered': 5.0, 'product_uom_qty': 5.0, 'name': 'expense_employee: expense_5 invoicing=delivery, expense=cost'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_4 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_3 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_2 invoicing=order, expense=sales_price'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
{'qty_delivered': 6.0, 'product_uom_qty': 6.0, 'name': 'expense_employee: expense_6 invoicing=order, expense=cost'},
{'qty_delivered': 5.0, 'product_uom_qty': 5.0, 'name': 'expense_employee: expense_5 invoicing=delivery, expense=cost'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_4 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_3 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_2 invoicing=order, expense=sales_price'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
# [13-18] SHEET 2 Lines: Created with the correct quantities
{'qty_delivered': 6.0, 'product_uom_qty': 6.0, 'name': 'expense_employee: expense_6 invoicing=order, expense=cost'},
{'qty_delivered': 5.0, 'product_uom_qty': 5.0, 'name': 'expense_employee: expense_5 invoicing=delivery, expense=cost'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_4 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_3 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_2 invoicing=order, expense=sales_price'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 3.0, 'expense_ids': []},
# [1-6] Original Lines: Created with the correct quantities
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [self.sale_exp_order_sale_1.id]},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [self.sale_exp_order_sale_2.id]},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [self.sale_exp_deliv_sale_3.id]},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [self.sale_exp_deliv_sale_4.id]},
{'qty_delivered': 5.0, 'product_uom_qty': 5.0, 'expense_ids': [self.sale_exp_deliv_cost_5.id]},
{'qty_delivered': 6.0, 'product_uom_qty': 6.0, 'expense_ids': [self.sale_exp_order_cost_6.id]},
# [7-12] Copy Lines: Created with the correct quantities
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [sale_exp_order_sale_1_copy.id]},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [sale_exp_order_sale_2_copy.id]},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [sale_exp_deliv_sale_3_copy.id]},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [sale_exp_deliv_sale_4_copy.id]},
{'qty_delivered': 5.0, 'product_uom_qty': 5.0, 'expense_ids': [sale_exp_deliv_cost_5_copy.id]},
{'qty_delivered': 6.0, 'product_uom_qty': 6.0, 'expense_ids': [sale_exp_order_cost_6_copy.id]},
])
self.sale_expense_sheet.account_move_id.button_draft()
# Reset the six expenses to draft and check that only them are unlinked
sale_expense_original_all.account_move_id.button_draft()
self.assertRecordValues(self.expense_sale_order.order_line, [
# [0] Line not created from a re-invoiced, should never be changed
{'qty_delivered': 0.0, 'product_uom_qty': 3.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
# [1-12] SHEET 1 Lines: quantities are reset to 0 and expenses are unlinked (because they are the oldest)
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_6 invoicing=order, expense=cost'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_5 invoicing=delivery, expense=cost'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_4 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_3 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_2 invoicing=order, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_6 invoicing=order, expense=cost'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_5 invoicing=delivery, expense=cost'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_4 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_3 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_2 invoicing=order, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
# [13-18] SHEET 2 Lines: Not caught by the reset
{'qty_delivered': 6.0, 'product_uom_qty': 6.0, 'name': 'expense_employee: expense_6 invoicing=order, expense=cost'},
{'qty_delivered': 5.0, 'product_uom_qty': 5.0, 'name': 'expense_employee: expense_5 invoicing=delivery, expense=cost'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_4 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_3 invoicing=delivery, expense=sales_price'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_2 invoicing=order, expense=sales_price'},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'name': 'expense_employee: expense_1 invoicing=order, expense=sales_price'},
{'qty_delivered': 0.0, 'product_uom_qty': 3.0, 'expense_ids': []},
# [1-6] Original Lines: quantities are reset to 0 and expenses are unlinked
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
{'qty_delivered': 0.0, 'product_uom_qty': 0.0, 'expense_ids': []},
# [7-12] Copy Lines: Not caught by the reset
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [sale_exp_order_sale_1_copy.id]},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [sale_exp_order_sale_2_copy.id]},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [sale_exp_deliv_sale_3_copy.id]},
{'qty_delivered': 1.0, 'product_uom_qty': 1.0, 'expense_ids': [sale_exp_deliv_sale_4_copy.id]},
{'qty_delivered': 5.0, 'product_uom_qty': 5.0, 'expense_ids': [sale_exp_deliv_cost_5_copy.id]},
{'qty_delivered': 6.0, 'product_uom_qty': 6.0, 'expense_ids': [sale_exp_order_cost_6_copy.id]},
])
def test_expenses_reinvoice_analytic_distribution(self):
"""Test expense line with multiple analytic accounts is reinvoiced correctly"""
""" Test expense line with multiple analytic accounts is re-invoiced correctly """
(self.company_data['product_order_sales_price'] + self.company_data['product_delivery_sales_price']).write({
'can_be_expensed': True,
@ -424,40 +427,25 @@ class TestReInvoice(TestExpenseCommon, TestSaleCommon):
})
sale_order.action_confirm()
expense_sheet = self.env['hr.expense.sheet'].create({
'name': 'First Expense for employee',
expense = self.create_expenses({
'name': 'expense_1',
'date': '2016-01-01',
'product_id': self.company_data['product_order_sales_price'].id,
'quantity': 2,
'analytic_distribution': {self.analytic_account_1.id: 50, self.analytic_account_2.id: 50},
'employee_id': self.expense_employee.id,
'journal_id': self.company_data['default_journal_purchase'].id,
'accounting_date': '2017-01-01',
'expense_line_ids': [
Command.create({
'name': 'expense_1',
'date': '2016-01-01',
'product_id': self.company_data['product_order_sales_price'].id,
'quantity': 2,
'analytic_distribution': {self.analytic_account_1.id: 50, self.analytic_account_2.id: 50},
'employee_id': self.expense_employee.id,
'sale_order_id': sale_order.id,
}),
],
'sale_order_id': sale_order.id,
})
expense_sheet.approve_expense_sheets()
expense_sheet.action_sheet_move_create()
expense.action_submit()
expense.action_approve()
self.post_expenses_with_wizard(expense)
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': 2.0,
'product_uom_qty': 2.0,
'is_expense': True,
},
{'qty_delivered': 0.0, 'product_uom_qty': 2.0, 'is_expense': False},
# Expense line:
{'qty_delivered': 2.0,'product_uom_qty': 2.0, 'is_expense': True},
])
def test_expense_reinvoice_tax_multine_line(self):
@ -522,26 +510,19 @@ class TestReInvoice(TestExpenseCommon, TestSaleCommon):
})
sale_order.action_confirm()
expense_sheet = self.env['hr.expense.sheet'].create({
'name': 'First Expense for employee',
expense = self.create_expenses([{
'name': 'expense_1',
'date': '2016-01-01',
'product_id': self.company_data['product_order_sales_price'].id,
'quantity': 1,
'employee_id': self.expense_employee.id,
'journal_id': self.company_data['default_journal_purchase'].id,
'accounting_date': '2017-01-01',
'expense_line_ids': [
Command.create({
'name': 'expense_1',
'date': '2016-01-01',
'product_id': self.company_data['product_order_sales_price'].id,
'quantity': 1,
'employee_id': self.expense_employee.id,
'sale_order_id': sale_order.id,
'tax_ids': multi_distribution_tax.ids,
}),
],
})
'sale_order_id': sale_order.id,
'tax_ids': multi_distribution_tax.ids,
}])
expense_sheet.approve_expense_sheets()
expense_sheet.action_sheet_move_create()
expense.action_submit()
expense._do_approve()
self.post_expenses_with_wizard(expense)
self.assertRecordValues(sale_order.order_line, [
# Original SO line:
@ -557,4 +538,3 @@ class TestReInvoice(TestExpenseCommon, TestSaleCommon):
'is_expense': True,
},
])