audrius/account-reconcile
1
0
Fork 1
mirror of https://github.com/OCA/account-reconcile.git synced 2025-01-20 12:27:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #505 into 14.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2023-01-01 17:15:33 +00:00
parent 699cf360d5 d38da251eb
commit b0437285ba
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
account_reconcile_payment_order/models/account_reconciliation_widget.py
View File

@@ -23,14 +23,15 @@ class AccountReconciliationWidget(models.AbstractModel):
def _get_reconcile_lines_from_order(self, st_line, order, excluded_ids=None): def _get_reconcile_lines_from_order(self, st_line, order, excluded_ids=None):
"""Return lines to reconcile our statement line with.""" """Return lines to reconcile our statement line with."""
aml_obj = self.env["account.move.line"] aml_obj = self.env["account.move.line"]
reconciled_lines = aml_obj.search( lines = aml_obj
[("bank_payment_line_id", "in", order.bank_line_ids.ids)] for payment in order.payment_ids:
lines |= payment.move_id.line_ids.filtered(
lambda x: x.account_id != payment.destination_account_id
and x.partner_id == payment.partner_id
)
return (lines - aml_obj.browse(excluded_ids)).filtered(
lambda x: not x.reconciled
) )
return (
reconciled_lines.mapped("move_id.line_ids")
- reconciled_lines
- aml_obj.browse(excluded_ids)
).filtered(lambda x: not x.reconciled)
def _prepare_proposition_from_orders(self, st_line, orders, excluded_ids=None): def _prepare_proposition_from_orders(self, st_line, orders, excluded_ids=None):
"""Fill with the expected format the reconciliation proposition """Fill with the expected format the reconciliation proposition