audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP]pms: reconcile payment with statements by ref and/or folios

Browse Source
This commit is contained in:
Darío Lodeiros
2022-02-01 20:17:05 +01:00
parent ed115e020c
commit c372c94ee5
2 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
pms/models/account_bank_statement.py
View File

@@ -34,40 +34,11 @@ class AccountBankStatement(models.Model):
) )
super(AccountBankStatement, self).button_post() super(AccountBankStatement, self).button_post()
for line in lines_of_moves_to_post: for line in lines_of_moves_to_post:
folio_ids = line.folio_ids.ids payment_move_line = line._get_payment_move_lines_to_reconcile(line)
if folio_ids: statement_move_line = line.move_id.line_ids.filtered(
to_reconcile_ids = self.env["account.move.line"].search( lambda line: line.account_id.reconcile
[ )
("move_id.folio_ids", "in", folio_ids), if payment_move_line and statement_move_line:
("reconciled", "=", False), statement_move_line.account_id = payment_move_line.account_id
"|", lines_to_reconcile = payment_move_line + statement_move_line
( lines_to_reconcile.reconcile()
"account_id",
"=",
self.journal_id.payment_debit_account_id.id,
),
(
"account_id",
"=",
self.journal_id.payment_credit_account_id.id,
),
("journal_id", "=", self.journal_id.id),
]
)
if to_reconcile_ids:
statement_move_line = line.move_id.line_ids.filtered(
lambda line: line.account_id.reconcile
)
payment_lines = self.env["account.move.line"].browse(
to_reconcile_ids.ids
)
# We try to reconcile by amount
payment_line = False
for record in payment_lines:
payment_line = (
record if abs(record.balance) == line.amount else False
)
if payment_line and statement_move_line:
statement_move_line.account_id = payment_line.account_id
lines_to_reconcile = payment_line + statement_move_line
lines_to_reconcile.reconcile()

30
pms/models/account_bank_statement_line.py
View File

@@ -48,3 +48,33 @@ class AccountBankStatementLine(models.Model):
} }
) )
return line_vals_list return line_vals_list
def _get_payment_move_lines_to_reconcile(self):
self.ensure_one()
payment_move_line = False
folio_ids = self.folio_ids and self.folio_ids.ids or False
domain = [("move_id.folio_ids", "in", folio_ids)] if folio_ids else []
domain.extend(
[
("move_id.ref", "=", self.payment_ref),
("date", "=", self.date),
("reconciled", "=", False),
"|",
(
"account_id",
"=",
self.journal_id.payment_debit_account_id.id,
),
(
"account_id",
"=",
self.journal_id.payment_credit_account_id.id,
),
("journal_id", "=", self.journal_id.id),
]
)
to_reconcile_move_lines = self.env["account.move.line"].search(domain)
# We try to reconcile by amount
for record in to_reconcile_move_lines:
payment_move_line = record if record.balance == self.amount else False
return payment_move_line