Skip to content

Commit

Permalink
FIX subscription_oca in multi company
Browse files Browse the repository at this point in the history
+ allow to invoice with recurring_next_date before today
  • Loading branch information
eLBati committed Jan 4, 2025
1 parent 09f9bde commit 3c9c086
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions subscription_oca/models/sale_subscription.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,22 +139,23 @@ def _read_group_stage_ids(self, stages, domain, order):

def cron_subscription_management(self):
today = date.today()
for subscription in self.search([]):
for subscription in self.search([], order="recurring_next_date asc"):
subscription = subscription.with_company(subscription.company_id)
if subscription.in_progress:
if (
subscription.recurring_next_date == today
subscription.recurring_next_date <= today
and subscription.sale_subscription_line_ids
):
try:
subscription.generate_invoice()
except Exception:
logger.exception("Error on subscription invoice generate")
if not subscription.recurring_rule_boundary:
if subscription.date == today:
if subscription.date <= today:
subscription.action_close_subscription()

else:
if subscription.date_start == today:
if subscription.date_start <= today:
subscription.action_start_subscription()
subscription.generate_invoice()

Expand Down

0 comments on commit 3c9c086

Please sign in to comment.