Skip to content

Commit

Permalink
Merge PR OCA#763 into 16.0
Browse files Browse the repository at this point in the history
Signed-off-by pedrobaeza
  • Loading branch information
OCA-git-bot committed Dec 12, 2024
2 parents 2452856 + e198c74 commit 3a0ee3e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
9 changes: 9 additions & 0 deletions account_reconcile_oca/models/account_journal.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,12 @@ def get_rainbowman_message(self):
if self.get_journal_dashboard_datas()["number_to_reconcile"] > 0:
return False
return _("Well done! Everything has been reconciled")

def open_action(self):
self.ensure_one()
if self.type not in ["bank", "cash"]:
return super().open_action()
action = self.env["ir.actions.actions"]._for_xml_id(
"account_reconcile_oca.action_bank_statement_line_reconcile_all"
)
return action
6 changes: 3 additions & 3 deletions account_reconcile_oca/views/account_bank_statement_line.xml
Original file line number Diff line number Diff line change
Expand Up @@ -356,12 +356,12 @@
<field
name="context"
>{'default_journal_id': active_id, 'view_ref': 'account_reconcile_oca.bank_statement_line_form_reconcile_view'}</field>
<field name="view_mode">tree,kanban</field>
<field name="view_mode">kanban,tree</field>
<field
name="view_ids"
eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('account_statement_base.account_bank_statement_line_tree')}),
(0, 0, {'view_mode': 'kanban', 'view_id': ref('bank_statement_line_reconcile_view')})]"
(0, 0, {'view_mode': 'kanban', 'view_id': ref('bank_statement_line_reconcile_view')}),
(0, 0, {'view_mode': 'tree', 'view_id': ref('account_statement_base.account_bank_statement_line_tree')})]"
/>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
Expand Down
5 changes: 5 additions & 0 deletions account_statement_base/views/account_bank_statement_line.xml
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,11 @@
string="Transaction Type"
context="{'group_by': 'transaction_type'}"
/>
<filter
name="date_groupby"
string="Date"
context="{'group_by': 'date'}"
/>
</group>
</search>
</field>
Expand Down

0 comments on commit 3a0ee3e

Please sign in to comment.