From 6195e9c778fb14200fad23b81a027185d4a2f57d Mon Sep 17 00:00:00 2001
From: Remi Filament <remi@le-filament.comx>
Date: Wed, 4 Jul 2018 10:37:37 +0200
Subject: [PATCH] Add check on sale_order status
---
models/sale.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/models/sale.py b/models/sale.py
index 10e0ce6..c2f562d 100644
--- a/models/sale.py
+++ b/models/sale.py
@@ -17,11 +17,14 @@ class SaleOrder(models.Model):
Compute the amount (untaxed) that remains to be invoiced from sale order
"""
for order in self:
- line_to_invoice = [line for line in order.order_line if line.invoice_status == 'to invoice' or line.invoice_status == 'invoiced']
+ if order.invoice_status == ('to invoice'):
+ line_to_invoice = [line for line in order.order_line if line.invoice_status != 'no']
- untaxed_amount_to_invoice = order.amount_untaxed
- for line in line_to_invoice:
- untaxed_amount_to_invoice -= line.qty_invoiced * line.price_unit
+ untaxed_amount_to_invoice = order.amount_untaxed
+ for line in line_to_invoice:
+ untaxed_amount_to_invoice -= line.qty_invoiced * line.price_unit
+ else:
+ untaxed_amount_to_invoice = 0.0
order.update({
'untaxed_amount_to_invoice': untaxed_amount_to_invoice
--
GitLab