Compare commits

..

No commits in common. "19.0" and "main" have entirely different histories.
19.0 ... main

4 changed files with 167 additions and 180 deletions

15
.gitignore vendored
View File

@ -1,15 +0,0 @@
# Python
__pycache__/
*.py[cod]
*$py.class
# OS
.DS_Store
Thumbs.db
# Editor
.vscode/
.idea/
# Odoo
*.pot

View File

@ -1,6 +1,6 @@
{ {
'name': 'Bank Statement Reconciliation', 'name': 'Bank Statement Reconciliation',
'version': '19.0.1.0.0', 'version': '17.0.1.0.0',
'category': 'Accounting', 'category': 'Accounting',
'summary': 'Reconcile bank statement lines with journal entries', 'summary': 'Reconcile bank statement lines with journal entries',
'description': """ 'description': """
@ -26,7 +26,7 @@
'wizards/bank_reconcile_wizard_views.xml', 'wizards/bank_reconcile_wizard_views.xml',
'views/menu.xml', 'views/menu.xml',
], ],
# List view includes sum="Total Amount" footer for displaying totals # Tree view includes sum="Total Amount" footer for displaying totals
'installable': True, 'installable': True,
'auto_install': False, 'auto_install': False,
} }

View File

@ -16,13 +16,13 @@ class BankStatementSelector(models.TransientModel):
'type': 'ir.actions.act_window', 'type': 'ir.actions.act_window',
'name': 'Bank Statement Lines', 'name': 'Bank Statement Lines',
'res_model': 'account.bank.statement.line', 'res_model': 'account.bank.statement.line',
'view_mode': 'list,form', 'view_mode': 'tree,form',
'domain': [('journal_id', '=', self.journal_id.id)], 'domain': [('journal_id', '=', self.journal_id.id)],
'context': { 'context': {
'search_default_journal_id': self.journal_id.id, 'search_default_journal_id': self.journal_id.id,
}, },
'views': [ 'views': [
(self.env.ref('bank_statement_reconciliation.view_account_bank_statement_line_tree').id, 'list'), (self.env.ref('bank_statement_reconciliation.view_account_bank_statement_line_tree').id, 'tree'),
(self.env.ref('bank_statement_reconciliation.view_account_bank_statement_line_form').id, 'form') (self.env.ref('bank_statement_reconciliation.view_account_bank_statement_line_form').id, 'form')
] ]
} }

View File

@ -4,8 +4,8 @@
<record id="action_bank_statement_lines" model="ir.actions.act_window"> <record id="action_bank_statement_lines" model="ir.actions.act_window">
<field name="name">Bank Statement Lines</field> <field name="name">Bank Statement Lines</field>
<field name="res_model">account.bank.statement.line</field> <field name="res_model">account.bank.statement.line</field>
<field name="view_mode">list,form</field> <field name="view_mode">tree,form</field>
<field name="context">{'list_view_ref': 'bank_statement_reconciliation.view_account_bank_statement_line_tree'}</field> <field name="context">{'tree_view_ref': 'bank_statement_reconciliation.view_account_bank_statement_line_tree'}</field>
<field name="help" type="html"> <field name="help" type="html">
<p class="o_view_nocontent_smiling_face"> <p class="o_view_nocontent_smiling_face">
Select a bank journal to view its statement lines Select a bank journal to view its statement lines
@ -33,12 +33,12 @@
</field> </field>
</record> </record>
<!-- List view for bank statement lines --> <!-- Tree view for bank statement lines -->
<record id="view_account_bank_statement_line_tree" model="ir.ui.view"> <record id="view_account_bank_statement_line_tree" model="ir.ui.view">
<field name="name">account.bank.statement.line.tree</field> <field name="name">account.bank.statement.line.tree</field>
<field name="model">account.bank.statement.line</field> <field name="model">account.bank.statement.line</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<list string="Bank Statement Lines" create="0" delete="0" decoration-danger="amount &lt; 0" decoration-muted="move_id and 'Reconciliation:' in move_id.name" multi_edit="1"> <tree string="Bank Statement Lines" create="0" delete="0" decoration-danger="amount &lt; 0" decoration-muted="move_id and 'Reconciliation:' in move_id.name" multi_edit="1">
<field name="company_id" column_invisible="True"/> <field name="company_id" column_invisible="True"/>
<field name="currency_id" column_invisible="True"/> <field name="currency_id" column_invisible="True"/>
<field name="suitable_journal_ids" column_invisible="True"/> <field name="suitable_journal_ids" column_invisible="True"/>
@ -49,7 +49,7 @@
<field name="journal_id"/> <field name="journal_id"/>
<field name="statement_id"/> <field name="statement_id"/>
<field name="move_id"/> <field name="move_id"/>
</list> </tree>
</field> </field>
</record> </record>
@ -97,10 +97,12 @@
<field name="date"/> <field name="date"/>
<filter name="positive_amount" string="Income" domain="[('amount', '&gt;', 0)]"/> <filter name="positive_amount" string="Income" domain="[('amount', '&gt;', 0)]"/>
<filter name="negative_amount" string="Expense" domain="[('amount', '&lt;', 0)]"/> <filter name="negative_amount" string="Expense" domain="[('amount', '&lt;', 0)]"/>
<filter name="hide_reconciled" string="Hide Reconciled" domain="[('is_reconciled', '=', False)]" help="Hide lines that have been reconciled"/> <filter name="hide_reconciled" string="Hide Reconciled" domain="[('move_id', 'not ilike', '%Reconciliation:%')]" help="Hide lines that have been reconciled"/>
<filter name="show_all" string="Show All" domain="[]" help="Show all lines including reconciled"/> <filter name="show_all" string="Show All" domain="[]" help="Show all lines including reconciled"/>
<filter name="group_by_journal" string="Journal" context="{'group_by': 'journal_id'}"/> <group expand="0" string="Group By">
<filter name="group_by_date" string="Date" context="{'group_by': 'date'}"/> <filter name="group_by_journal" string="Journal" context="{'group_by': 'journal_id'}"/>
<filter name="group_by_date" string="Date" context="{'group_by': 'date'}"/>
</group>
</search> </search>
</field> </field>
</record> </record>