Cédric Krier pushed to branch branch/default at Tryton / Tryton
Commits:
baf7fc59 by Cédric Krier at 2023-03-16T13:22:19+01:00
Allow to extend the invoices list to compute invoice state of sale and purchase
So advance payment invoices can be included in the original computation
instead of duplicating the computation since changeset 1a763ffe4a66 renamed
waiting into pending and add more states.
- - - - -
3 changed files:
- modules/purchase/purchase.py
- modules/sale/sale.py
- modules/sale_advance_payment/sale.py
Changes:
=====================================
modules/purchase/purchase.py
=====================================
@@ -597,7 +597,11 @@
return [('lines.invoice_lines.invoice' + clause[0][len(name):],
*clause[1:])]
+ @property
+ def _invoices_for_state(self):
+ return self.invoices
+
def get_invoice_state(self):
'''
Return the invoice state for the purchase.
'''
@@ -600,10 +604,10 @@
def get_invoice_state(self):
'''
Return the invoice state for the purchase.
'''
- skip_ids = set(x.id for x in self.invoices_ignored)
- skip_ids.update(x.id for x in self.invoices_recreated)
- invoices = [i for i in self.invoices if i.id not in skip_ids]
+ skips = set(self.invoices_ignored)
+ skips.update(self.invoices_recreated)
+ invoices = [i for i in self._invoices_for_state if i.id not in skips]
if invoices:
if any(i.state == 'cancelled' for i in invoices):
return 'exception'
=====================================
modules/sale/sale.py
=====================================
@@ -607,7 +607,11 @@
return [('lines.invoice_lines.invoice' + clause[0][len(name):],
*clause[1:])]
+ @property
+ def _invoices_for_state(self):
+ return self.invoices
+
def get_invoice_state(self):
'''
Return the invoice state for the sale.
'''
@@ -610,10 +614,10 @@
def get_invoice_state(self):
'''
Return the invoice state for the sale.
'''
- skip_ids = set(x.id for x in self.invoices_ignored)
- skip_ids.update(x.id for x in self.invoices_recreated)
- invoices = [i for i in self.invoices if i.id not in skip_ids]
+ skips = set(self.invoices_ignored)
+ skips.update(self.invoices_recreated)
+ invoices = [i for i in self._invoices_for_state if i not in skips]
if invoices:
if any(i.state == 'cancelled' for i in invoices):
return 'exception'
=====================================
modules/sale_advance_payment/sale.py
=====================================
@@ -345,20 +345,9 @@
return [('advance_payment_conditions.invoice_lines.invoice'
+ clause[0][len(name):], *clause[1:])]
- def get_invoice_state(self):
- state = super(Sale, self).get_invoice_state()
- skip_ids = set(x.id for x in self.invoices_ignored)
- skip_ids.update(x.id for x in self.invoices_recreated)
- invoices = [i
- for i in self.advance_payment_invoices if i.id not in skip_ids]
- if invoices:
- if any(i.state == 'cancelled' for i in invoices):
- return 'exception'
- elif all(i.state == 'paid' for i in invoices):
- return state
- else:
- return 'waiting'
- return state
+ @property
+ def _invoices_for_state(self):
+ return super()._invoices_for_state + self.advance_payment_invoices
def get_recall_lines(self, invoice):
pool = Pool()
View it on Heptapod:
https://foss.heptapod.net/tryton/tryton/-/commit/baf7fc59e2d4d6d84f57c64904a62f03e48a6cbe
--
View it on Heptapod:
https://foss.heptapod.net/tryton/tryton/-/commit/baf7fc59e2d4d6d84f57c64904a62f03e48a6cbe
You're receiving this email because of your account on foss.heptapod.net.