Cédric Krier pushed to branch branch/default at Tryton / Tryton
Commits:
9ca33a19 by Cédric Krier at 2023-07-24T23:51:00+02:00
Generate invoices and consumptions only for contextual company
Closes #12345
- - - - -
1 changed file:
- modules/sale_subscription/subscription.py
Changes:
=====================================
modules/sale_subscription/subscription.py
=====================================
@@ -423,8 +423,9 @@
if date is None:
date = Date.today()
+ company_id = Transaction().context.get('company', -1)
consumptions = Consumption.search([
('invoice_line', '=', None),
('line.subscription.next_invoice_date', '<=', date),
('line.subscription.state', 'in', ['running', 'closed']),
@@ -426,10 +427,9 @@
consumptions = Consumption.search([
('invoice_line', '=', None),
('line.subscription.next_invoice_date', '<=', date),
('line.subscription.state', 'in', ['running', 'closed']),
- ('line.subscription.company', '=',
- Transaction().context.get('company')),
+ ('line.subscription.company', '=', company_id),
],
order=[
('line.subscription.id', 'DESC'),
@@ -466,6 +466,7 @@
subscriptions = cls.search([
('next_invoice_date', '<=', date),
+ ('company', '=', company_id),
])
for subscription in subscriptions:
if subscription.state == 'running':
@@ -778,8 +779,9 @@
if date is None:
date = Date.today()
+ company_id = Transaction().context.get('company', -1)
remainings = all_lines = cls.search([
('consumption_recurrence', '!=', None),
('next_consumption_date_delayed', '<=', date),
('subscription.state', '=', 'running'),
@@ -781,10 +783,9 @@
remainings = all_lines = cls.search([
('consumption_recurrence', '!=', None),
('next_consumption_date_delayed', '<=', date),
('subscription.state', '=', 'running'),
- ('subscription.company', '=',
- Transaction().context.get('company')),
+ ('subscription.company', '=', company_id),
])
consumptions = []
View it on Heptapod:
https://foss.heptapod.net/tryton/tryton/-/commit/9ca33a199252180c7875438b2f5c241d8e5b6829
--
View it on Heptapod:
https://foss.heptapod.net/tryton/tryton/-/commit/9ca33a199252180c7875438b2f5c241d8e5b6829
You're receiving this email because of your account on foss.heptapod.net.
