diff --git a/addons/account/models/reconciliation_widget.py b/addons/account/models/reconciliation_widget.py index ca9513e4f39..2579d119858 100644 --- a/addons/account/models/reconciliation_widget.py +++ b/addons/account/models/reconciliation_widget.py @@ -265,6 +265,7 @@ class AccountReconciliation(models.AbstractModel): assert account_type in ('payable', 'receivable', None) is_partner = res_type == 'partner' res_alias = is_partner and 'p' or 'a' + aml_ids = self._context.get('active_ids') and self._context.get('active_model') == 'account.move.line' and tuple(self._context.get('active_ids')) query = (""" SELECT {0} account_id, account_name, account_code, max_date, @@ -302,7 +303,8 @@ class AccountReconciliation(models.AbstractModel): {7} AND l.amount_residual < 0 ) - GROUP BY {8} a.id, a.name, a.code, {res_alias}.last_time_entries_checked + {8} + GROUP BY {9} a.id, a.name, a.code, {res_alias}.last_time_entries_checked ORDER BY {res_alias}.last_time_entries_checked ) as s WHERE (last_time_entries_checked IS NULL OR max_date > last_time_entries_checked) @@ -315,6 +317,7 @@ class AccountReconciliation(models.AbstractModel): res_ids and 'AND ' + res_alias + '.id in %(res_ids)s' or '', self.env.user.company_id.id, is_partner and 'AND l.partner_id = p.id' or ' ', + aml_ids and 'AND l.id IN %(aml_ids)s' or '', is_partner and 'l.partner_id, p.id,' or ' ', res_alias=res_alias )) @@ -336,7 +339,7 @@ class AccountReconciliation(models.AbstractModel): currency = account.currency_id or account.company_id.currency_id row['currency_id'] = currency.id partner_id = is_partner and row['partner_id'] or None - rec_prop = self._get_move_line_reconciliation_proposition(account.id, partner_id) + rec_prop = aml_ids and self.env['account.move.line'].browse(aml_ids) or self._get_move_line_reconciliation_proposition(account.id, partner_id) row['reconciliation_proposition'] = self._prepare_move_lines(rec_prop, target_currency=currency) row['company_id'] = account.company_id.id return rows diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml index 4225438b351..47fd1c9026e 100644 --- a/addons/account/wizard/account_reconcile_view.xml +++ b/addons/account/wizard/account_reconcile_view.xml @@ -26,14 +26,11 @@ - + Reconcile Entries - account.move.line.reconcile - form - form - - new - + manual_reconciliation_view + + action