From 9bedda1835830f829b565f35dcd67562ce4bbf54 Mon Sep 17 00:00:00 2001
From: Adrien Widart <awt@odoo.com>
Date: Tue, 6 Jul 2021 12:32:18 +0000
Subject: [PATCH] [FIX] sale_stock: set invoice_status value when delivery is
canceled
Suppose the option "Lock Confirmed Sales" enabled and a product with the
invoicing policy set to "Delivered quantities". When cancelling the
delivery of such a product, the invoice status of the associated SO
should be 'Nothing to Invoice'
To reproduce the error:
1. In Settings, enable "Lock Confirmed Sales"
2. Create a product P:
- Type: Consumable
- Invoicing policy: Delivered quantities
3. Create a SO with one P
4. Confirm the SO
5. Cancel the SO's delivery
6. Check the invoice status (`invoice_status`)
- 12.0: Either by modifying the view, or by adding the field with
studio or directly via PSQL
- 13.0+: The field can be enabled thanks to the options of the tree
view
Error: The invoice status is "Fully Invoiced" but the product hasn't be
delivered and no invoice has been created
OPW-2464343
closes odoo/odoo#73310
Signed-off-by: William Henrotin <Whenrow@users.noreply.github.com>
---
addons/sale_stock/models/sale_order.py | 10 +++++++-
addons/sale_stock/tests/test_sale_stock.py | 29 +++++++++++++++++++++-
2 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/addons/sale_stock/models/sale_order.py b/addons/sale_stock/models/sale_order.py
index 1df2e6cb9af0..95217c33faef 100644
--- a/addons/sale_stock/models/sale_order.py
+++ b/addons/sale_stock/models/sale_order.py
@@ -235,6 +235,14 @@ class SaleOrderLine(models.Model):
@api.depends('order_id.state')
def _compute_invoice_status(self):
+ def check_moves_state(moves):
+ # All moves states are either 'done' or 'cancel', and there is at least one 'done'
+ at_least_one_done = False
+ for move in moves:
+ if move.state not in ['done', 'cancel']:
+ return False
+ at_least_one_done = at_least_one_done or move.state == 'done'
+ return at_least_one_done
super(SaleOrderLine, self)._compute_invoice_status()
for line in self:
# We handle the following specific situation: a physical product is partially delivered,
@@ -246,7 +254,7 @@ class SaleOrderLine(models.Model):
and line.product_id.type in ['consu', 'product']\
and line.product_id.invoice_policy == 'delivery'\
and line.move_ids \
- and all(move.state in ['done', 'cancel'] for move in line.move_ids):
+ and check_moves_state(line.move_ids):
line.invoice_status = 'invoiced'
@api.depends('move_ids')
diff --git a/addons/sale_stock/tests/test_sale_stock.py b/addons/sale_stock/tests/test_sale_stock.py
index 43d7913c1f75..8ba8e999ec1d 100644
--- a/addons/sale_stock/tests/test_sale_stock.py
+++ b/addons/sale_stock/tests/test_sale_stock.py
@@ -488,4 +488,31 @@ class TestSaleStock(TestSale):
})
so1.picking_ids.button_validate()
self.assertEqual(so1.picking_ids.state, 'done')
- self.assertEqual(so1.order_line.mapped('qty_delivered'), [1, 1, 1])
\ No newline at end of file
+ self.assertEqual(so1.order_line.mapped('qty_delivered'), [1, 1, 1])
+
+ def test_08_cancel_delivery(self):
+ """
+ Suppose the option "Lock Confirmed Sales" enabled and a product with the invoicing policy set to "Delivered
+ quantities". When cancelling the delivery of such a product, the invoice status of the associated SO should be
+ 'Nothing to Invoice'
+ """
+ self.env['ir.config_parameter'].set_param('sale.auto_done_setting', True)
+
+ product = self.products['prod_del']
+ so = self.env['sale.order'].create({
+ 'partner_id': self.partner.id,
+ 'partner_invoice_id': self.partner.id,
+ 'partner_shipping_id': self.partner.id,
+ 'order_line': [(0, 0, {
+ 'name': product.name,
+ 'product_id': product.id,
+ 'product_uom_qty': 2,
+ 'product_uom': product.uom_id.id,
+ 'price_unit': product.list_price
+ })],
+ 'pricelist_id': self.env.ref('product.list0').id,
+ })
+ so.action_confirm()
+ so.picking_ids.action_cancel()
+
+ self.assertEqual(so.invoice_status, 'no')
--
GitLab