Skip to content

[FIX] account_interests: change job_id for cron_id #849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cav-adhoc wants to merge 1 commit into
base: 18.0
Choose a base branch
from
Open

[FIX] account_interests: change job_id for cron_id #849

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 60 additions & 15 deletions account_interests/models/res_company_interest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ class ResCompanyInterest(models.Model):
required=True,
domain=lambda self: [
("account_type", "=", "asset_receivable"),
("company_ids", "=", self._context.get("default_company_id") or self.env.company.id),
(
"company_ids",
"=",
self._context.get("default_company_id") or self.env.company.id,
),
],
)
interest_product_id = fields.Many2one(
Expand Down Expand Up @@ -72,7 +76,9 @@ class ResCompanyInterest(models.Model):
default=fields.Date.today,
)
domain = fields.Char(
"Additional Filters", default="[]", help="Extra filters that will be added to the standard search"
"Additional Filters",
default="[]",
help="Extra filters that will be added to the standard search",
)
has_domain = fields.Boolean(compute="_compute_has_domain")
bypass_company_interest = fields.Boolean(
Expand Down Expand Up @@ -111,7 +117,9 @@ def _cron_recurring_interests_invoices(self, batch_size=1):
rec.env.cr.commit()
except Exception as e:
_logger.error(
"Error creating interest invoices for company: %s, Error: %s", rec.company_id.name, str(e)
"Error creating interest invoices for company: %s, Error: %s",
rec.company_id.name,
str(e),
)
rec.env.cr.rollback()
rec.company_id.message_post(
Expand All @@ -126,7 +134,10 @@ def _cron_recurring_interests_invoices(self, batch_size=1):
else:
last_updated_id = 0
avoid_companies = self.with_context(prefetch_fields=False).search(
[("next_date", "<=", current_date), ("bypass_company_interest", "=", True)]
[
("next_date", "<=", current_date),
("bypass_company_interest", "=", True),
]
Copy link

Copilot AI Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

En Odoo 19, el contexto de los crons utiliza cron_id en lugar de job_id. Este cambio es correcto y necesario. Sin embargo, asegúrate de que el bump de versión en __manifest__.py esté incluido en este PR, ya que se están modificando comportamientos de modelo.

Copilot generated this review using guidance from repository custom instructions.
)
if avoid_companies:
company_names = ", ".join(avoid_companies.mapped("company_id.name"))
Expand All @@ -141,7 +152,7 @@ def _cron_recurring_interests_invoices(self, batch_size=1):
self.env.cr.commit() # pragma pylint: disable=invalid-commit

if last_updated_id:
cron = self.env["ir.cron"].browse(self.env.context.get("job_id")) or self.env.ref(
cron = self.env["ir.cron"].browse(self.env.context.get("cron_id")) or self.env.ref(
"account_interests.cron_recurring_interests_invoices"
)
cron._trigger()
Expand All @@ -160,7 +171,11 @@ def _calculate_date_deltas(self, rule_type, interval):

def create_interest_invoices(self):
for rec in self:
_logger.info("Creating Interest Invoices (id: %s, company: %s)", rec.id, rec.company_id.name)
_logger.info(
"Creating Interest Invoices (id: %s, company: %s)",
rec.id,
rec.company_id.name,
)
# hacemos un commit para refrescar cache
# TODO ver de utilizar savepoints: https://github.com/OCA/odoo-community.org/blob/master/website/Contribution/CONTRIBUTING.rst#never-commit-the-transaction
self.env.cr.commit() # pragma pylint: disable=invalid-commit
Expand All @@ -177,7 +192,8 @@ def create_interest_invoices(self):
# llamamos a crear las facturas con la compañia del interes para
# que tome correctamente las cuentas
rec.with_company(rec.company_id).with_context(
default_l10n_ar_afip_asoc_period_start=from_date, default_l10n_ar_afip_asoc_period_end=to_date
default_l10n_ar_afip_asoc_period_start=from_date,
default_l10n_ar_afip_asoc_period_end=to_date,
).create_invoices(from_date, to_date)
self._clear_processed_partner_ids_for_company(self.company_id)

Expand Down Expand Up @@ -247,7 +263,11 @@ def _calculate_debts(self, from_date, to_date, groupby=None):
# Intereses por el último período
last_period_lines = self.env["account.move.line"].search(
self._get_move_line_domains()
+ [("amount_residual", ">", 0), ("date_maturity", ">=", from_date), ("date_maturity", "<", to_date)]
+ [
("amount_residual", ">", 0),
("date_maturity", ">=", from_date),
("date_maturity", "<", to_date),
]
)
for partner, amls in last_period_lines.grouped("partner_id").items():
interest = sum(
Expand All @@ -272,7 +292,11 @@ def _calculate_debts(self, from_date, to_date, groupby=None):

if self.domain:
partial_domain.append(
("debit_move_id", "any", safe_eval.safe_eval(self.domain, self._get_eval_context()))
(
"debit_move_id",
"any",
safe_eval.safe_eval(self.domain, self._get_eval_context()),
)
)

partials = (
Expand All @@ -295,15 +319,25 @@ def _search_last_journal_for_partner(self, partner, debt):
journal = (
self.env["account.move"]
.with_context(internal_type="debit_note", default_move_type="out_invoice")
.new({"partner_id": partner.id, "move_type": "out_invoice", "company_id": self.company_id.id})
.new(
{
"partner_id": partner.id,
"move_type": "out_invoice",
"company_id": self.company_id.id,
}
)
.journal_id
)

# Si el journal está archivado o no coincide con las cuentas configuradas, buscar uno alternativo
if not journal.active or self.receivable_account_ids != journal.default_account_id:
journal = (
self.env["account.journal"].search(
[("default_account_id", "in", self.receivable_account_ids.ids), ("active", "=", True)], limit=1
[
("default_account_id", "in", self.receivable_account_ids.ids),
("active", "=", True),
],
limit=1,
)
or journal
)
Expand Down Expand Up @@ -340,7 +374,12 @@ def create_invoices(self, from_date, to_date):
while batch_start < total_items:
items = list(deuda.items())
batch = dict(items[batch_start : batch_start + batch_size])
_logger.info("Processing batch %s to %s of %s", batch_start + 1, batch_start + len(batch), total_items)
_logger.info(
"Processing batch %s to %s of %s",
batch_start + 1,
batch_start + len(batch),
total_items,
)
# Crear facturas
processed_partner_ids = self._get_processed_partner_ids_for_company(self.company_id)

Expand All @@ -354,7 +393,10 @@ def create_invoices(self, from_date, to_date):
continue

_logger.info(
"Creating Interest Invoice (%s of %s) for partner ID: %s", idx + 1, total_items, partner.id
"Creating Interest Invoice (%s of %s) for partner ID: %s",
idx + 1,
total_items,
partner.id,
)

move = self.env["account.move"].create(move_vals)
Expand All @@ -364,7 +406,7 @@ def create_invoices(self, from_date, to_date):
try:
move.action_post()
except Exception as e:
_logger.error("Something went wrong creating " f"interests invoice: {e}")
_logger.error(f"Something went wrong creating interests invoice: {e}")
self._set_processed_partner_ids_for_company(self.company_id, [p.id for p in batch])
self.env.cr.commit() # pragma pylint: disable=invalid-commit
batch_start += batch_size
Expand All @@ -378,7 +420,10 @@ def _prepare_info(self, to_date):
date_format = lang.date_format
to_date_format = to_date.strftime(date_format)
if not self.past_due_rate:
res = _("Deuda Vencida al %s con tasa de interés de %s") % (to_date_format, self.rate)
res = _("Deuda Vencida al %s con tasa de interés de %s") % (
to_date_format,
self.rate,
)
else:
res = _(
"Deuda Vencida al %s de periodos anteriores con tasa de interés de %s. "
Expand Down