changeset 8a59f2ec9a02 in modules/sale_advance_payment:default
details:
https://hg.tryton.org/modules/sale_advance_payment?cmd=changeset;node=8a59f2ec9a02
description:
Rename invoice state from cancel to cancelled
issue8927
review303661003
diffstat:
sale.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diffs (35 lines):
diff -r 9c6f56246cc3 -r 8a59f2ec9a02 sale.py
--- a/sale.py Mon May 04 12:25:40 2020 +0200
+++ b/sale.py Sat Jun 06 10:23:14 2020 +0100
@@ -257,12 +257,12 @@
def _get_advance_amount(self):
return sum(l.amount for l in self.invoice_lines
- if l.invoice.state != 'cancel')
+ if l.invoice.state != 'cancelled')
def _get_ignored_amount(self):
skips = {l for i in self.sale.invoices_recreated for l in i.lines}
return sum(l.amount for l in self.invoice_lines
- if l.invoice.state == 'cancel' and l not in skips)
+ if l.invoice.state == 'cancelled' and l not in skips)
def get_completed(self, name):
advance_amount = 0
@@ -354,7 +354,7 @@
invoices = [i
for i in self.advance_payment_invoices if i.id not in skip_ids]
if invoices:
- if any(i.state == 'cancel' for i in invoices):
+ if any(i.state == 'cancelled' for i in invoices):
return 'exception'
elif all(i.state == 'paid' for i in invoices):
return state
@@ -483,6 +483,6 @@
skips = set(sale.invoices_ignored)
skips.update(sale.invoices_recreated)
for invoice in sale.advance_payment_invoices:
- if invoice.state == 'cancel' and invoice not in skips:
+ if invoice.state == 'cancelled' and invoice not in skips:
invoices.append(invoice.id)
return default
