Victor Piryns (pivi)
9ed8db4f6e
Current behaviour: In the project update dashboard, invoices and bills that are created directly (without sales order or purchase order) are not taken into account in the calculations for profits/costs. Expected behaviour: They should be taken into account, as long as the line on them has the analytic account line on it. Steps to reproduce: - Install Project, Sales, Purchase, Accounting - Activate "Analytic Accounting" in Settings - Create a new Project and create a new analytic account for the project - Create a Bill with a product (storable/consumable) and the analytic account on the line - Post the bill - Go to your project update dashboard and notice the cost of the bill is not taken into account, but we do have a smart button that goes to the bills Reason for the problem: Profits/Costs calculations are done based on the sales/purchase orders, missing the "orphaned" invoices and bills. A side effect of this problem, storable products on sales are also not taken into account, since Sales Orders don't have an analytic account per line before version 16, unless that product is a service (all services intrinsically have an analytic account) Fix: Get all invoices/bills that have lines with the project's analytic account, and removing from those the lines that were already accounted for. Affected versions: - saas-15.3 - 16.0 - master opw-3058198 closes odoo/odoo#108176 X-original-commit: 3d3f4109a06445b6ce9606770085c763ea206b35 Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com> Signed-off-by: Piryns Victor (pivi) <pivi@odoo.com>
348 lines
16 KiB
Python
348 lines
16 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
from datetime import datetime
|
|
|
|
from odoo import Command
|
|
from odoo.tests import tagged
|
|
|
|
from odoo.addons.sale.tests.common import TestSaleCommon
|
|
from odoo.addons.project.tests.test_project_profitability import TestProjectProfitabilityCommon as Common
|
|
|
|
|
|
class TestProjectProfitabilityCommon(Common):
|
|
@classmethod
|
|
def setUpClass(cls):
|
|
super().setUpClass()
|
|
uom_unit_id = cls.env.ref('uom.product_uom_unit').id
|
|
|
|
# Create material product
|
|
cls.material_product = cls.env['product.product'].create({
|
|
'name': 'Material',
|
|
'type': 'consu',
|
|
'standard_price': 5,
|
|
'list_price': 10,
|
|
'invoice_policy': 'order',
|
|
'uom_id': uom_unit_id,
|
|
'uom_po_id': uom_unit_id,
|
|
})
|
|
|
|
# Create service products
|
|
uom_hour = cls.env.ref('uom.product_uom_hour')
|
|
cls.product_delivery_service = cls.env['product.product'].create({
|
|
'name': "Service Delivery, create task in global project",
|
|
'standard_price': 30,
|
|
'list_price': 90,
|
|
'type': 'service',
|
|
'invoice_policy': 'delivery',
|
|
'service_type': 'manual',
|
|
'uom_id': uom_hour.id,
|
|
'uom_po_id': uom_hour.id,
|
|
'default_code': 'SERV-ORDERED2',
|
|
'service_tracking': 'task_global_project',
|
|
'project_id': cls.project.id,
|
|
})
|
|
cls.sale_order = cls.env['sale.order'].with_context(tracking_disable=True).create({
|
|
'partner_id': cls.partner.id,
|
|
'partner_invoice_id': cls.partner.id,
|
|
'partner_shipping_id': cls.partner.id,
|
|
})
|
|
SaleOrderLine = cls.env['sale.order.line'].with_context(tracking_disable=True, default_order_id=cls.sale_order.id)
|
|
cls.delivery_service_order_line = SaleOrderLine.create({
|
|
'product_id': cls.product_delivery_service.id,
|
|
'product_uom_qty': 10,
|
|
})
|
|
cls.sale_order.action_confirm()
|
|
|
|
|
|
@tagged('-at_install', 'post_install')
|
|
class TestSaleProjectProfitability(TestProjectProfitabilityCommon, TestSaleCommon):
|
|
def test_project_profitability(self):
|
|
self.assertFalse(self.project.allow_billable, 'The project should be non billable.')
|
|
self.assertDictEqual(
|
|
self.project._get_profitability_items(False),
|
|
self.project_profitability_items_empty,
|
|
'No data for the project profitability should be found since the project is not billable, so no SOL is linked to the project.'
|
|
)
|
|
self.project.write({'allow_billable': True})
|
|
self.assertTrue(self.project.allow_billable, 'The project should be billable.')
|
|
self.project.sale_line_id = self.delivery_service_order_line
|
|
self.assertDictEqual(
|
|
self.project._get_profitability_items(False),
|
|
self.project_profitability_items_empty,
|
|
'No data for the project profitability should be found since no product is delivered in the SO linked.'
|
|
)
|
|
self.delivery_service_order_line.qty_delivered = 1
|
|
service_policy_to_invoice_type = self.project._get_service_policy_to_invoice_type()
|
|
invoice_type = service_policy_to_invoice_type[self.delivery_service_order_line.product_id.service_policy]
|
|
self.assertIn(
|
|
invoice_type,
|
|
['billable_manual', 'service_revenues'],
|
|
'invoice_type="billable_manual" if sale_timesheet is installed otherwise it is equal to "service_revenues"')
|
|
sequence_per_invoice_type = self.project._get_profitability_sequence_per_invoice_type()
|
|
self.assertIn('service_revenues', sequence_per_invoice_type)
|
|
self.assertDictEqual(
|
|
self.project._get_profitability_items(False),
|
|
{
|
|
'revenues': {
|
|
'data': [
|
|
{
|
|
# id should be equal to "billable_manual" if "sale_timesheet" module is installed otherwise "service_revenues"
|
|
'id': invoice_type,
|
|
'sequence': sequence_per_invoice_type[invoice_type],
|
|
'to_invoice': self.delivery_service_order_line.untaxed_amount_to_invoice,
|
|
'invoiced': self.delivery_service_order_line.untaxed_amount_invoiced,
|
|
},
|
|
],
|
|
'total': {
|
|
'to_invoice': self.delivery_service_order_line.untaxed_amount_to_invoice,
|
|
'invoiced': self.delivery_service_order_line.untaxed_amount_invoiced,
|
|
},
|
|
},
|
|
'costs': {
|
|
'data': [],
|
|
'total': {'billed': 0.0, 'to_bill': 0.0},
|
|
},
|
|
}
|
|
)
|
|
self.assertNotEqual(self.delivery_service_order_line.untaxed_amount_to_invoice, 0.0)
|
|
self.assertEqual(self.delivery_service_order_line.untaxed_amount_invoiced, 0.0)
|
|
|
|
# create an invoice
|
|
context = {
|
|
'active_model': 'sale.order',
|
|
'active_ids': self.sale_order.ids,
|
|
'active_id': self.sale_order.id,
|
|
}
|
|
invoices = self.env['sale.advance.payment.inv'].with_context(context).create({
|
|
'advance_payment_method': 'delivered',
|
|
})._create_invoices(self.sale_order)
|
|
invoices.action_post()
|
|
|
|
self.assertEqual(self.delivery_service_order_line.qty_invoiced, 1)
|
|
self.assertEqual(self.delivery_service_order_line.untaxed_amount_to_invoice, 0.0)
|
|
self.assertNotEqual(self.delivery_service_order_line.untaxed_amount_invoiced, 0.0)
|
|
invoice_type = service_policy_to_invoice_type[self.delivery_service_order_line.product_id.service_policy]
|
|
self.assertIn(
|
|
invoice_type,
|
|
['billable_manual', 'service_revenues'],
|
|
'invoice_type="billable_manual" if sale_timesheet is installed otherwise it is equal to "service_revenues"')
|
|
self.assertDictEqual(
|
|
self.project._get_profitability_items(False),
|
|
{
|
|
'revenues': {
|
|
'data': [
|
|
{
|
|
'id': invoice_type,
|
|
'sequence': sequence_per_invoice_type[invoice_type],
|
|
'to_invoice': 0.0,
|
|
'invoiced': self.delivery_service_order_line.untaxed_amount_invoiced,
|
|
},
|
|
],
|
|
'total': {
|
|
'to_invoice': 0.0,
|
|
'invoiced': self.delivery_service_order_line.untaxed_amount_invoiced,
|
|
},
|
|
},
|
|
'costs': {
|
|
'data': [],
|
|
'total': {'billed': 0.0, 'to_bill': 0.0},
|
|
},
|
|
}
|
|
)
|
|
|
|
# Add 2 sales order items in the SO
|
|
SaleOrderLine = self.env['sale.order.line'].with_context(tracking_disable=True, default_order_id=self.sale_order.id)
|
|
manual_service_order_line = SaleOrderLine.create({
|
|
'product_id': self.product_delivery_service.id,
|
|
'product_uom_qty': 5,
|
|
'qty_delivered': 5,
|
|
})
|
|
material_order_line = SaleOrderLine.create({
|
|
'product_id': self.material_product.id,
|
|
'product_uom_qty': 1,
|
|
'qty_delivered': 1,
|
|
})
|
|
service_sols = self.delivery_service_order_line + manual_service_order_line
|
|
invoice_type = service_policy_to_invoice_type[manual_service_order_line.product_id.service_policy]
|
|
self.assertIn(
|
|
invoice_type,
|
|
['billable_manual', 'service_revenues'],
|
|
'invoice_type="billable_manual" if sale_timesheet is installed otherwise it is equal to "service_revenues"')
|
|
self.assertDictEqual(
|
|
self.project._get_profitability_items(False),
|
|
{
|
|
'revenues': {
|
|
'data': [
|
|
{
|
|
'id': invoice_type,
|
|
'sequence': sequence_per_invoice_type[invoice_type],
|
|
'to_invoice': sum(service_sols.mapped('untaxed_amount_to_invoice')),
|
|
'invoiced': sum(service_sols.mapped('untaxed_amount_invoiced')),
|
|
},
|
|
{
|
|
'id': 'other_revenues',
|
|
'sequence': sequence_per_invoice_type['other_revenues'],
|
|
'to_invoice': material_order_line.untaxed_amount_to_invoice,
|
|
'invoiced': material_order_line.untaxed_amount_invoiced,
|
|
},
|
|
],
|
|
'total': {
|
|
'to_invoice': sum(service_sols.mapped('untaxed_amount_to_invoice')) + material_order_line.untaxed_amount_to_invoice,
|
|
'invoiced': sum(service_sols.mapped('untaxed_amount_invoiced')) + material_order_line.untaxed_amount_invoiced,
|
|
},
|
|
},
|
|
'costs': { # no cost because we have no purchase orders.
|
|
'data': [],
|
|
'total': {'billed': 0.0, 'to_bill': 0.0},
|
|
},
|
|
},
|
|
)
|
|
self.assertNotEqual(manual_service_order_line.untaxed_amount_to_invoice, 0.0)
|
|
self.assertEqual(manual_service_order_line.untaxed_amount_invoiced, 0.0)
|
|
self.assertNotEqual(material_order_line.untaxed_amount_to_invoice, 0.0)
|
|
self.assertEqual(material_order_line.untaxed_amount_invoiced, 0.0)
|
|
|
|
credit_notes = invoices._reverse_moves()
|
|
credit_notes.action_post()
|
|
self.assertDictEqual(
|
|
self.project._get_profitability_items(False),
|
|
{
|
|
'revenues': {
|
|
'data': [
|
|
{
|
|
'id': invoice_type,
|
|
'sequence': sequence_per_invoice_type[invoice_type],
|
|
'to_invoice': sum(service_sols.mapped('untaxed_amount_to_invoice')),
|
|
'invoiced': manual_service_order_line.untaxed_amount_invoiced,
|
|
},
|
|
{
|
|
'id': 'other_revenues',
|
|
'sequence': sequence_per_invoice_type['other_revenues'],
|
|
'to_invoice': material_order_line.untaxed_amount_to_invoice,
|
|
'invoiced': material_order_line.untaxed_amount_invoiced,
|
|
},
|
|
],
|
|
'total': {
|
|
'to_invoice': sum(service_sols.mapped('untaxed_amount_to_invoice')) + material_order_line.untaxed_amount_to_invoice,
|
|
'invoiced': manual_service_order_line.untaxed_amount_invoiced + material_order_line.untaxed_amount_invoiced,
|
|
},
|
|
},
|
|
'costs': { # no cost because we have no purchase orders.
|
|
'data': [],
|
|
'total': {'billed': 0.0, 'to_bill': 0.0},
|
|
},
|
|
},
|
|
)
|
|
|
|
self.sale_order._action_cancel()
|
|
self.assertDictEqual(
|
|
self.project._get_profitability_items(False),
|
|
self.project_profitability_items_empty,
|
|
)
|
|
|
|
def test_invoices_without_sale_order_are_accounted_in_profitability(self):
|
|
"""
|
|
An invoice that has an AAL on one of its line should be taken into account
|
|
for the profitability of the project.
|
|
"""
|
|
self.project.allow_billable = True
|
|
# create a invoice_1 with the AAL
|
|
invoice_1 = self.env['account.move'].create({
|
|
"name": "Invoice_1",
|
|
"move_type": "out_invoice",
|
|
"state": "draft",
|
|
"partner_id": self.partner.id,
|
|
"invoice_date": datetime.today(),
|
|
"invoice_line_ids": [Command.create({
|
|
"analytic_distribution": {self.analytic_account.id: 100},
|
|
"product_id": self.product_a.id,
|
|
"quantity": 1,
|
|
"product_uom_id": self.product_a.uom_id.id,
|
|
"price_unit": self.product_a.standard_price,
|
|
})],
|
|
})
|
|
# the bill_1 is in draft, therefor it should have the cost "to_invoice" same as the -product_price (untaxed)
|
|
self.assertDictEqual(
|
|
self.project._get_profitability_items(False)['revenues'],
|
|
{
|
|
'data': [{
|
|
'id': 'other_invoice_revenues',
|
|
'sequence': self.project._get_profitability_sequence_per_invoice_type()['other_invoice_revenues'],
|
|
'to_invoice': self.product_a.standard_price,
|
|
'invoiced': 0.0,
|
|
}],
|
|
'total': {'to_invoice': self.product_a.standard_price, 'invoiced': 0.0},
|
|
},
|
|
)
|
|
# post invoice_1
|
|
invoice_1.action_post()
|
|
# we posted the invoice_1, therefore the revenue "invoiced" should be -product_price, to_invoice should be back to 0
|
|
self.assertDictEqual(
|
|
self.project._get_profitability_items(False)['revenues'],
|
|
{
|
|
'data': [{
|
|
'id': 'other_invoice_revenues',
|
|
'sequence': self.project._get_profitability_sequence_per_invoice_type()['other_invoice_revenues'],
|
|
'to_invoice': 0.0,
|
|
'invoiced': self.product_a.standard_price,
|
|
}],
|
|
'total': {'to_invoice': 0.0, 'invoiced': self.product_a.standard_price},
|
|
},
|
|
)
|
|
# create another invoice, with 2 lines, 2 diff products, the second line has 2 as quantity
|
|
invoice_2 = self.env['account.move'].create({
|
|
"name": "I have 2 lines",
|
|
"move_type": "out_invoice",
|
|
"state": "draft",
|
|
"partner_id": self.partner.id,
|
|
"invoice_date": datetime.today(),
|
|
"invoice_line_ids": [Command.create({
|
|
"analytic_distribution": {self.analytic_account.id: 100},
|
|
"product_id": self.product_a.id,
|
|
"quantity": 1,
|
|
"product_uom_id": self.product_a.uom_id.id,
|
|
"price_unit": self.product_a.standard_price,
|
|
}), Command.create({
|
|
"analytic_distribution": {self.analytic_account.id: 100},
|
|
"product_id": self.product_b.id,
|
|
"quantity": 2,
|
|
"product_uom_id": self.product_b.uom_id.id,
|
|
"price_unit": self.product_b.standard_price,
|
|
})],
|
|
})
|
|
# invoice_2 is not posted, therefor its cost should be "to_invoice" = - sum of all product_price * qty for each line
|
|
self.assertDictEqual(
|
|
self.project._get_profitability_items(False)['revenues'],
|
|
{
|
|
'data': [{
|
|
'id': 'other_invoice_revenues',
|
|
'sequence': self.project._get_profitability_sequence_per_invoice_type()['other_invoice_revenues'],
|
|
'to_invoice': (self.product_a.standard_price + 2 * self.product_b.standard_price),
|
|
'invoiced': self.product_a.standard_price,
|
|
}],
|
|
'total': {
|
|
'to_invoice': (self.product_a.standard_price + 2 * self.product_b.standard_price),
|
|
'invoiced': self.product_a.standard_price,
|
|
},
|
|
},
|
|
)
|
|
# post invoice_2
|
|
invoice_2.action_post()
|
|
# invoice_2 is posted, therefor its revenue should be counting in "invoiced", with the revenues from invoice_1
|
|
self.assertDictEqual(
|
|
self.project._get_profitability_items(False)['revenues'],
|
|
{
|
|
'data': [{
|
|
'id': 'other_invoice_revenues',
|
|
'sequence': self.project._get_profitability_sequence_per_invoice_type()['other_invoice_revenues'],
|
|
'to_invoice': 0.0,
|
|
'invoiced': 2 * (self.product_a.standard_price + self.product_b.standard_price),
|
|
}],
|
|
'total': {
|
|
'to_invoice': 0.0,
|
|
'invoiced': 2 * (self.product_a.standard_price + self.product_b.standard_price),
|
|
},
|
|
},
|
|
)
|