From d977541b382ab0621191c31676081b70fdf3ee3e Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Wed, 2 Aug 2017 15:58:11 +0200 Subject: [PATCH] Revert c1d22b6 and c854de4 The specification of the task https://www.odoo.com/web#id=31984&view_type=form&model=project.task&action=333&active_id=131&menu_id=4720 is inconsistent with the way we propose to make refunds on a sales order. While waiting to propose a clean solution, we revert the related commits. --- addons/sale/models/sale.py | 2 +- addons/sale_stock/tests/test_sale_stock.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py index af6f3a002bf..5299868d2ca 100644 --- a/addons/sale/models/sale.py +++ b/addons/sale/models/sale.py @@ -585,7 +585,7 @@ class SaleOrderLine(models.Model): for line in self: if line.state not in ('sale', 'done'): line.invoice_status = 'no' - elif float_compare(line.qty_to_invoice, 0.0, precision_digits=precision) == 1: + elif not float_is_zero(line.qty_to_invoice, precision_digits=precision): line.invoice_status = 'to invoice' elif line.state == 'sale' and line.product_id.invoice_policy == 'order' and\ float_compare(line.qty_delivered, line.product_uom_qty, precision_digits=precision) == 1: diff --git a/addons/sale_stock/tests/test_sale_stock.py b/addons/sale_stock/tests/test_sale_stock.py index ebdf62b8493..5a4755d2c16 100644 --- a/addons/sale_stock/tests/test_sale_stock.py +++ b/addons/sale_stock/tests/test_sale_stock.py @@ -172,7 +172,7 @@ class TestSaleStock(TestSale): return_pick.do_new_transfer() # Check invoice - self.assertEqual(self.so.invoice_status, 'invoiced', 'Sale Stock: so invoice_status should be "to invoice" instead of "%s" after picking return' % self.so.invoice_status) + self.assertEqual(self.so.invoice_status, 'to invoice', 'Sale Stock: so invoice_status should be "to invoice" instead of "%s" after picking return' % self.so.invoice_status) self.assertEqual(self.so.order_line[0].qty_delivered, 3.0, 'Sale Stock: delivered quantity should be 3.0 instead of "%s" after picking return' % self.so.order_line[0].qty_delivered) # let's do an invoice with refunds adv_wiz = self.env['sale.advance.payment.inv'].with_context(active_ids=[self.so.id]).create({