Merge PR #637 into 16.0

Signed-off-by etobella
This commit is contained in:
OCA-git-bot
2024-03-17 00:10:46 +00:00
2 changed files with 46 additions and 14 deletions

View File

@@ -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">
@@ -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>
<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')}),
(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">

View File

@@ -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"
@@ -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>