details: https://code.tryton.org/tryton/commit/fee96f0f00e8
branch: default
user: Cédric Krier <[email protected]>
date: Wed Feb 21 15:07:05 2024 +0100
description:
Rename _get_invoice_sale in _get_invoice on sale
diffstat:
modules/carrier_carriage/sale.py | 2 +-
modules/sale/sale.py | 4 ++--
modules/sale_advance_payment/sale.py | 2 +-
modules/sale_invoice_date/sale.py | 4 ++--
modules/sale_invoice_grouping/sale.py | 6 +++---
modules/sale_shipment_cost/sale.py | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diffs (92 lines):
diff -r 1e8f6bace846 -r fee96f0f00e8 modules/carrier_carriage/sale.py
--- a/modules/carrier_carriage/sale.py Sun Nov 23 19:20:17 2025 +0100
+++ b/modules/carrier_carriage/sale.py Wed Feb 21 15:07:05 2024 +0100
@@ -121,7 +121,7 @@
for shipment in self.sale.shipments:
if (shipment.state == 'done'
and shipment.id not in shipment_cost_invoiced):
- invoice = self.sale._get_invoice_sale()
+ invoice = self.sale._get_invoice()
for carriage in shipment.carriages:
# XXX: self is not necessary linked to carriage
invoice_line = carriage.get_cost_sale_invoice_line(
diff -r 1e8f6bace846 -r fee96f0f00e8 modules/sale/sale.py
--- a/modules/sale/sale.py Sun Nov 23 19:20:17 2025 +0100
+++ b/modules/sale/sale.py Wed Feb 21 15:07:05 2024 +0100
@@ -971,7 +971,7 @@
sale.total_amount_cache = sale.total_amount
cls.save(sales)
- def _get_invoice_sale(self):
+ def _get_invoice(self):
'Return invoice'
pool = Pool()
Invoice = pool.get('account.invoice')
@@ -1002,7 +1002,7 @@
if not invoice_lines:
return
- invoice = self._get_invoice_sale()
+ invoice = self._get_invoice()
if getattr(invoice, 'lines', None):
invoice_lines = list(invoice.lines) + invoice_lines
invoice.lines = invoice_lines
diff -r 1e8f6bace846 -r fee96f0f00e8 modules/sale_advance_payment/sale.py
--- a/modules/sale_advance_payment/sale.py Sun Nov 23 19:20:17 2025 +0100
+++ b/modules/sale_advance_payment/sale.py Wed Feb 21 15:07:05 2024 +0100
@@ -216,7 +216,7 @@
return super().copy(conditions, default)
def create_invoice(self):
- invoice = self.sale._get_invoice_sale()
+ invoice = self.sale._get_invoice()
if self.invoice_delay is not None:
invoice.invoice_date = self.sale.sale_date + self.invoice_delay
invoice.payment_term = None
diff -r 1e8f6bace846 -r fee96f0f00e8 modules/sale_invoice_date/sale.py
--- a/modules/sale_invoice_date/sale.py Sun Nov 23 19:20:17 2025 +0100
+++ b/modules/sale_invoice_date/sale.py Wed Feb 21 15:07:05 2024 +0100
@@ -119,8 +119,8 @@
def _invoice_term_date(self):
return
- def _get_invoice_sale(self):
- invoice = super()._get_invoice_sale()
+ def _get_invoice(self):
+ invoice = super()._get_invoice()
if self.invoice_term:
invoice.invoice_date = self.invoice_term.get_date(
date=self._invoice_term_date)
diff -r 1e8f6bace846 -r fee96f0f00e8 modules/sale_invoice_grouping/sale.py
--- a/modules/sale_invoice_grouping/sale.py Sun Nov 23 19:20:17 2025 +0100
+++ b/modules/sale_invoice_grouping/sale.py Wed Feb 21 15:07:05 2024 +0100
@@ -43,14 +43,14 @@
)
return invoice_domain
- def _get_invoice_sale(self):
+ def _get_invoice(self):
transaction = Transaction()
context = transaction.context
- invoice = super()._get_invoice_sale()
+ invoice = super()._get_invoice()
if (not context.get('skip_grouping', False)
and self.invoice_grouping_method):
with transaction.set_context(skip_grouping=True):
- invoice = self._get_invoice_sale()
+ invoice = self._get_invoice()
Invoice = invoice.__class__
domain = self._get_grouped_invoice_domain(invoice)
order = self._get_grouped_invoice_order()
diff -r 1e8f6bace846 -r fee96f0f00e8 modules/sale_shipment_cost/sale.py
--- a/modules/sale_shipment_cost/sale.py Sun Nov 23 19:20:17 2025 +0100
+++ b/modules/sale_shipment_cost/sale.py Wed Feb 21 15:07:05 2024 +0100
@@ -434,7 +434,7 @@
if (shipment.state == 'done'
and shipment.id not in shipment_cost_invoiced):
invoice_line = shipment.get_cost_sale_invoice_line(
- self.sale._get_invoice_sale(), origin=self)
+ self.sale._get_invoice(), origin=self)
if invoice_line:
lines.append(invoice_line)
shipment_cost_invoiced.append(shipment.id)
