Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[16.0][IMP] [account_statement_base account_reconcile_oca] make statements listed and editable #637

Merged
merged 2 commits into from
Mar 17, 2024
Merged

[16.0][IMP] [account_statement_base account_reconcile_oca] make statements listed and editable #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74d4b47
[IMP] account_reconile_oca: Set tree views
lk-eska Mar 15, 2024
df5a929
[IMP] account_statement_base: Set tree views
lk-eska Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions account_reconcile_oca/views/account_bank_statement_line.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,11 +306,12 @@
<field
name="context"
>{'default_journal_id': active_id, 'search_default_not_reconciled': True, 'view_ref': 'account_reconcile_oca.bank_statement_line_form_reconcile_view'}</field>
<field name="view_mode">tree</field>
<field name="view_mode">kanban,tree</field>
<field
name="view_ids"
eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', '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 All @@ -325,11 +326,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</field>
<field name="view_mode">tree,kanban</field>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<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('bank_statement_line_reconcile_view')})]"
(0, 0, {'view_mode': 'tree', 'view_id': ref('account_statement_base.account_bank_statement_line_tree')}),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change the order, first the kanban please 😉

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just sent a fix.

(0, 0, {'view_mode': 'kanban', 'view_id': ref('bank_statement_line_reconcile_view')})]"
/>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
Expand Down
50 changes: 40 additions & 10 deletions account_statement_base/views/account_bank_statement_line.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,51 @@
<record id="account_bank_statement_line_tree" model="ir.ui.view">
<field name="model">account.bank.statement.line</field>
<field name="arch" type="xml">
<tree decoration-muted="is_reconciled">
<tree editable="top" multi_edit="1" decoration-muted="is_reconciled">
<field name="sequence" widget="handle" />
<field name="date" />
<field name="payment_ref" />
<field name="ref" optional="hide" />
<field name="partner_id" />
<field name="amount" />
<field name="date" attrs="{'readonly': [('is_reconciled', '=', True)]}" />
<field
name="payment_ref"
attrs="{'readonly': [('is_reconciled', '=', True)]}"
/>
<field
name="ref"
optional="hide"
attrs="{'readonly': [('is_reconciled', '=', True)]}"
/>
<field
name="partner_id"
attrs="{'readonly': [('is_reconciled', '=', True)]}"
/>
<field name="amount" attrs="{'readonly': [('is_reconciled', '=', True)]}" />
<field
name="foreign_currency_id"
optional="hidden"
groups="base.group_multi_currency"
attrs="{'readonly': [('is_reconciled', '=', True)]}"
/>
<field
name="amount_currency"
optional="hide"
groups="base.group_multi_currency"
attrs="{'readonly': [('is_reconciled', '=', True)]}"
/>
<field
name="narration"
optional="hide"
string="Notes"
attrs="{'readonly': [('is_reconciled', '=', True)]}"
/>
<field
name="journal_id"
optional="hide"
attrs="{'readonly': [('is_reconciled', '=', True)]}"
/>
<field
name="partner_bank_id"
optional="hide"
attrs="{'readonly': [('is_reconciled', '=', True)]}"
/>
<field name="narration" optional="hide" string="Notes" />
<field name="journal_id" optional="hide" />
<field name="partner_bank_id" optional="hide" />
<button
name="action_undo_reconciliation"
type="object"
Expand All @@ -85,9 +115,9 @@
<field name="company_id" invisible="1" />
<field name="is_reconciled" invisible="1" />
<field name="currency_id" invisible="1" />
<field name="foreign_currency_id" invisible="1" />
<field name="country_code" invisible="1" />
<field name="state" invisible="1" />
<field name="suitable_journal_ids" invisible="1" />
</tree>
</field>
</record>
Expand Down