Techsystech
/
account-reconcile
mirror of https://github.com/OCA/account-reconcile.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[16.0][FIX] account_mass_reconcile: New environment is initialized when the for loop begins so as not to lose the record of last reconciled items by having "commit_every" > 0 configured

pull/686/head
Sergio Bustamante 2024-08-26 15:46:57 +02:00
parent 75ba5c17a7
commit 0bd0681def
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
account_mass_reconcile/models/mass_reconcile.py
View File

@ -150,17 +150,17 @@ class AccountMassReconcile(models.Model):
return auto_rec_id.automatic_reconcile() return auto_rec_id.automatic_reconcile()
def run_reconcile(self): def run_reconcile(self):
def find_reconcile_ids(fieldname, move_line_ids): def find_reconcile_ids(fieldname, move_line_ids, new_env):
if not move_line_ids: if not move_line_ids:
return [] return []
self.env.flush_all() new_env.flush_all()
sql = """ sql = """
SELECT DISTINCT %s FROM account_move_line SELECT DISTINCT %s FROM account_move_line
WHERE %s IS NOT NULL AND id in %s WHERE %s IS NOT NULL AND id in %s
""" """
params = [AsIs(fieldname), AsIs(fieldname), tuple(move_line_ids)] params = [AsIs(fieldname), AsIs(fieldname), tuple(move_line_ids)]
self.env.cr.execute(sql, params) new_env.cr.execute(sql, params)
res = self.env.cr.fetchall() res = new_env.cr.fetchall()
return [row[0] for row in res] return [row[0] for row in res]
# we use a new cursor to be able to commit the reconciliation # we use a new cursor to be able to commit the reconciliation
@ -169,10 +169,18 @@ class AccountMassReconcile(models.Model):
# does not. # does not.
for rec in self: for rec in self:
ctx = self.env.context.copy()
ctx["commit_every"] = rec.account.company_id.reconciliation_commit_every
if ctx["commit_every"]:
new_cr = sql_db.db_connect(self.env.cr.dbname).cursor()
new_env = api.Environment(new_cr, self.env.uid, ctx)
else:
new_cr = self.env.cr
new_env = self.env
# SELECT FOR UPDATE the mass reconcile row ; this is done in order # SELECT FOR UPDATE the mass reconcile row ; this is done in order
# to avoid 2 processes on the same mass reconcile method. # to avoid 2 processes on the same mass reconcile method.
try: try:
self.env.cr.execute( new_env.cr.execute(
"SELECT id FROM account_mass_reconcile" "SELECT id FROM account_mass_reconcile"
" WHERE id = %s" " WHERE id = %s"
" FOR UPDATE NOWAIT", " FOR UPDATE NOWAIT",
@ -185,14 +193,6 @@ class AccountMassReconcile(models.Model):
"please try again later." "please try again later."
) )
) from e ) from e
ctx = self.env.context.copy()
ctx["commit_every"] = rec.account.company_id.reconciliation_commit_every
if ctx["commit_every"]:
new_cr = sql_db.db_connect(self.env.cr.dbname).cursor()
new_env = api.Environment(new_cr, self.env.uid, ctx)
else:
new_cr = self.env.cr
new_env = self.env
try: try:
all_ml_rec_ids = [] all_ml_rec_ids = []
@ -202,8 +202,10 @@ class AccountMassReconcile(models.Model):
all_ml_rec_ids += ml_rec_ids all_ml_rec_ids += ml_rec_ids
reconcile_ids = find_reconcile_ids("full_reconcile_id", all_ml_rec_ids) reconcile_ids = find_reconcile_ids(
self.env["mass.reconcile.history"].create( "full_reconcile_id", all_ml_rec_ids, new_env
)
new_env["mass.reconcile.history"].create(
{ {
"mass_reconcile_id": rec.id, "mass_reconcile_id": rec.id,
"date": fields.Datetime.now(), "date": fields.Datetime.now(),