[IMP] account: improve Journal Items UX

Journal items: - 2 list views were available for the journal items. As these changes make them very similar, the "grouped" view is dropped and only the simple/normal list view is used. - As the usefull information is now available from the list items, the more complex name that was previously used on the group by lines is not useful anymore. - Removed duplicated filters. - Added and modified columns of the list view. - Removed the button opening the move form from the move line, and made the move name clickable (with same behaviour as the button). - Removed edit button on some group by lines, as it can lead to unwanted access errors. - Removed 2 filters and added 1. - Added a field to use for the matching widget. - `move_id` was replaced by `move_name`, because the sorting of the Many2One `move_id` is not based on its name and was thus not working as intended. task 2855459 closes odoo/odoo#93586 Related: odoo/enterprise#28361 Related: odoo/upgrade#3598 Signed-off-by: Cedric Snauwaert <csn@odoo.com>
2022-06-17 16:31:00 +02:00
parent 5a4220ef2c
commit d2bd3427b6
6 changed files with 102 additions and 139 deletions
@@ -108,6 +108,7 @@ You could use this simplified accounting in case you work with an (external) acc
            'account/static/src/js/tours/account.js',
            'account/static/src/js/bills_upload.js',
            'account/static/src/js/account_selection.js',
+            'account/static/src/js/open_move_widget.js',
        ],
        'web.assets_frontend': [
            'account/static/src/js/account_portal_sidebar.js',
@@ -2223,15 +2223,7 @@ class AccountMove(models.Model):
    def name_get(self):
        result = []
        for move in self:
-            if self._context.get('name_groupby'):
-                name = '**%s**, %s' % (format_date(self.env, move.date), move._get_move_display_name())
-                if move.ref:
-                    name += '     (%s)' % move.ref
-                if move.partner_id.name:
-                    name += ' - %s' % move.partner_id.name
-            else:
-                name = move._get_move_display_name(show_ref=True)
-            result.append((move.id, name))
+            result.append((move.id, move._get_move_display_name(show_ref=True)))
        return result

    # -------------------------------------------------------------------------
@@ -3525,7 +3517,7 @@ class AccountMoveLine(models.Model):
        index=True, required=True, readonly=True, auto_join=True, ondelete="cascade",
        check_company=True,
        help="The move of this entry line.")
-    move_name = fields.Char(string='Number', related='move_id.name', store=True, index='trigram')
+    move_name = fields.Char(string='Number', related='move_id.name', store=True, index='btree')
    date = fields.Date(related='move_id.date', store=True, readonly=True, index=True, copy=False, group_operator='min')
    ref = fields.Char(related='move_id.ref', store=True, copy=False, index='trigram', readonly=True)
    parent_state = fields.Selection(related='move_id.state', store=True, readonly=True)
@@ -3534,6 +3526,7 @@ class AccountMoveLine(models.Model):
    company_currency_id = fields.Many2one(related='company_id.currency_id', string='Company Currency',
        readonly=True, store=True,
        help='Utility field to express amount currency')
+    is_same_currency = fields.Boolean(compute='_compute_same_currency')
    is_storno = fields.Boolean(
        related='move_id.is_storno',
        string='Company Storno Accounting',
@@ -3640,6 +3633,7 @@ class AccountMoveLine(models.Model):
    matched_credit_ids = fields.One2many('account.partial.reconcile', 'debit_move_id', string='Matched Credits',
        help='Credit journal items that are matched with this journal item.', readonly=True)
    matching_number = fields.Char(string="Matching #", compute='_compute_matching_number', store=True, help="Matching number for this line, 'P' if it is only partially reconcile, or the name of the full reconcile if it exists.")
+    is_account_reconcile = fields.Boolean(related='account_id.reconcile', string='Account Reconcile', help='Technical field for the matching link widget')

    # ==== Analytic fields ====
    analytic_line_ids = fields.One2many('account.analytic.line', 'move_id', string='Analytic lines')
@@ -4388,6 +4382,11 @@ class AccountMoveLine(models.Model):

            record.tax_audit = audit_str

+    @api.depends('currency_id', 'company_currency_id')
+    def _compute_same_currency(self):
+        for record in self:
+            record.is_same_currency = record.currency_id == record.company_currency_id
+
    # -------------------------------------------------------------------------
    # CONSTRAINT METHODS
    # -------------------------------------------------------------------------
@@ -5884,13 +5883,22 @@ class AccountMoveLine(models.Model):
        return action

    def open_move(self):
-        return {
-            'type': 'ir.actions.act_window',
-            'res_model': 'account.move',
-            'view_mode': 'form',
-            'res_id': self.move_id.id,
-            'views': [(False, 'form')],
-        }
+        if self.payment_id:
+            return {
+                'type': 'ir.actions.act_window',
+                'res_model': 'account.payment',
+                'view_mode': 'form',
+                'res_id': self.payment_id.id,
+                'views': [(False, 'form')],
+            }
+        else:
+            return {
+                'type': 'ir.actions.act_window',
+                'res_model': 'account.move',
+                'view_mode': 'form',
+                'res_id': self.move_id.id,
+                'views': [(False, 'form')],
+            }


    def action_automatic_entry(self):
@@ -0,0 +1,23 @@
+/** @odoo-module **/
+import fieldRegistry from 'web.field_registry';
+import { FieldChar } from 'web.basic_fields';
+
+const OpenMoveWidget = FieldChar.extend({
+    template: 'account.OpenMoveTemplate',
+    events: Object.assign({}, FieldChar.prototype.events, {
+        'click': '_onOpenMove',
+    }),
+    _onOpenMove: function(ev) {
+        ev.preventDefault();
+        ev.stopPropagation();
+        var self = this;
+        this._rpc({
+            model: 'account.move.line',
+            method: 'open_move',
+            args: [this.res_id],
+        }).then(function (actionData){
+            return self.do_action(actionData);
+        });
+    },
+});
+fieldRegistry.add('open_move_widget', OpenMoveWidget);
@@ -33,4 +33,8 @@
        </t>
    </tr>

+    <t t-name="account.OpenMoveTemplate">
+        <a href="#" t-esc="widget.value"/>
+    </t>
+
 </templates>
@@ -150,100 +150,40 @@
            <field name="model">account.move.line</field>
            <field eval="100" name="priority"/>
            <field name="arch" type="xml">
-                <tree string="Journal Items" create="false" edit="false" multi_edit="1" sample="1">
+                <tree string="Journal Items" create="false" edit="false" expand="context.get('expand', False)" multi_edit="1" sample="1">
                    <field name="date" readonly="1"/>
                    <field name="company_id" groups="base.group_multi_company" optional="hide"/>
-                    <field name="journal_id" options='{"no_open":True}'/>
-                    <field name="move_id" optional="show"/>
+                    <field name="journal_id" options='{"no_open":True}' optional="hide"/>
+                    <field name="move_name" string="Journal Entry" optional="show" widget="open_move_widget"/>
                    <field name="account_id" options="{'no_open': True}" groups="account.group_account_readonly"/>
-                    <field name="partner_id" optional="show"/>
-                    <field name="statement_id" invisible="1"/>
-                    <field name="ref" optional="show"/>
+                    <field name="partner_id" optional="hide" attrs="{'readonly':[('account_internal_type','in', ('payable','receivable'))]}"/>
+                    <field name="ref" optional="hide"/>
+                    <field name="product_id" optional="hide"/>
                    <field name="name" optional="show"/>
-                    <field name="analytic_account_id" groups="account.group_account_readonly" optional="show" attrs="{'readonly':[('parent_state','=','posted')]}"/>
-                    <field name="analytic_tag_ids" widget="many2many_tags" groups="analytic.group_analytic_tags" optional="hide" readonly="1"/>
-                    <field name="tax_ids" widget="many2many_tags" width="0.5" optional="show" readonly="1"/>
+                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" optional="show" attrs="{'readonly':[('parent_state','=','posted')]}"/>
+                    <field name="tax_ids" widget="many2many_tags" width="0.5" optional="hide" readonly="1"/>
+                    <field name="amount_currency" groups="base.group_multi_currency" optional="show" readonly="1" attrs="{'invisible':[('is_same_currency', '=', True)]}"/>
+                    <field name="currency_id" readonly="1" groups="base.group_multi_currency" optional="hide" string="Currency" attrs="{'invisible':[('is_same_currency', '=', True)]}"/>
                    <field name="debit" sum="Total Debit" readonly="1"/>
                    <field name="credit" sum="Total Credit" readonly="1"/>
-                    <field name="amount_currency" groups="base.group_multi_currency" optional="hide" readonly="1"/>
-                    <field name="currency_id" readonly="1" groups="base.group_multi_currency" optional="hide" string="Original Currency"/>
                    <field name="tax_tag_ids" string="Tax Grids" widget="many2many_tags" width="0.5" optional="hide"/>
+                    <field name="tax_line_id" string="Originator Tax" optional="hide" readonly="1"/>
+                    <field name="date_maturity" optional="hide"/>
+                    <field name="balance" sum="Total Balance" optional="hide" readonly="1"/>
+                    <field name="cumulated_balance" optional="hide"/>
+                    <field name="matching_number" optional="show"/>
+
+                    <field name="parent_state" invisible="1"/>
+                    <field name="account_internal_type" invisible="1"/>
+                    <field name="statement_id" invisible="1"/>
+                    <field name="company_currency_id" invisible="1"/>
                    <field name="reconcile_model_id" invisible="1"/>
                    <field name="reconciled" invisible="1"/>
-                    <field name="date_maturity" optional="hide"/>
-                    <field name="company_currency_id" invisible="1"/>
-                    <field name="parent_state" invisible="1"/>
-                    <field name="tax_line_id" optional="hide" readonly="1"/>
-                    <field name="balance" sum="Total Balance" optional="hide" readonly="1"/>
-                    <field name="matching_number" optional="show"/>
-                    <field name="product_id" optional="hide"/>
-                    <button name="open_move" title="Open Journal Entry" type="object" icon="fa-edit"/>
-                    <groupby name="move_id">
-                        <field name="state" invisible="1"/>
-                        <field name="move_type" invisible="1"/>
-                        <field name="statement_id" invisible="1"/>
-                        <field name="payment_id" invisible="1"/>
-                        <button name="edit" type="edit" icon="fa-edit" title="Edit" attrs="{'invisible': ['&amp;', ('move_type', '=', 'entry'), '|', ('statement_id', '!=', False), ('payment_id', '!=', False)]}"/>
-                        <button name="open_bank_statement_view" type="object" icon="fa-edit" title="Edit" attrs="{'invisible': ['|', ('move_type', '!=', 'entry'), ('statement_id', '=', False)]}"/>
-                        <button name="open_payment_view" type="object" icon="fa-edit" title="Edit" attrs="{'invisible': ['|', ('move_type', '!=', 'entry'), ('payment_id', '=', False)]}"/>
-                    </groupby>
-                    <groupby name="account_id">
-                        <button name="edit" type="edit" icon="fa-edit" title="Edit"/>
-                    </groupby>
+                    <field name="is_same_currency" invisible="1"/>
+                    
                    <groupby name="partner_id">
                        <button name="edit" type="edit" icon="fa-edit" title="Edit"/>
                    </groupby>
-                    <groupby name="journal_id">
-                        <button name="edit" type="edit" icon="fa-edit" title="Edit"/>
-                    </groupby>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_move_line_tree_grouped" model="ir.ui.view">
-            <field name="name">account.move.line.tree.grouped</field>
-            <field name="model">account.move.line</field>
-            <field eval="1" name="priority"/>
-            <field name="arch" type="xml">
-                <tree string="Journal Items" create="false" expand="context.get('expand', False)" multi_edit="1">
-                    <field name="date" optional="show" readonly="1"/>
-                    <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}" optional="hide"/>
-                    <field name="journal_id" options="{'no_open': True, 'no_create': True}" optional="hide"/>
-                    <field name="move_id" optional="show"/>
-                    <field name="account_id" optional="show" options="{'no_open': True, 'no_create': True}"
-                           domain="[('company_id', '=', company_id)]"
-                           groups="account.group_account_readonly"/>
-                    <field name="statement_id" invisible="1"/>
-                    <field name="partner_id" optional="hide"/>
-                    <field name="ref" optional="hide"/>
-                    <field name="name"/>
-                    <field name="reconciled" invisible="1"/>
-                    <field name="reconcile_model_id" invisible="1"/>
-                    <field name="date_maturity" optional="hide"/>
-                    <field name="analytic_account_id" optional="hide" groups="analytic.group_analytic_accounting" attrs="{'readonly':[('parent_state','=','posted')]}"/>
-                    <field name="analytic_tag_ids" optional="hide" readonly="1" widget="many2many_tags" groups="analytic.group_analytic_tags"/>
-                    <field name="amount_currency" readonly="1" groups="base.group_multi_currency" optional="show"/>
-                    <field name="currency_id" readonly="1" groups="base.group_multi_currency" optional="hide" string="Original Currency"/>
-                    <field name="debit" sum="Total Debit" readonly="1"/>
-                    <field name="credit" sum="Total Credit" readonly="1"/>
-                    <field name="balance" sum="Total Balance" readonly="1" optional="hide"/>
-                    <field name="matching_number" string="Matching" optional="show"/>
-                    <field name="company_currency_id" invisible="1"/>
-                    <field name="parent_state" invisible="1"/>
-                    <field name="tax_ids" widget="many2many_tags" width="0.5" optional="hide" readonly="1"/>
-                    <field name="tax_tag_ids" widget="many2many_tags" width="0.5" optional="hide" string="Tax Grids"
-                           options="{'no_open': True, 'no_create': True}"
-                           domain="[('applicability', '=', 'taxes')]"/>
-                    <field name="product_id" optional="hide"/>
-                    <groupby name="move_id">
-                        <field name="state" invisible="1"/>
-                        <field name="move_type" invisible="1"/>
-                        <field name="statement_id" invisible="1"/>
-                        <field name="payment_id" invisible="1"/>
-                        <button name="edit" type="edit" icon="fa-edit" title="Edit" attrs="{'invisible': ['&amp;', ('move_type', '=', 'entry'), '|', ('statement_id', '!=', False), ('payment_id', '!=', False)]}"/>
-                        <button name="open_bank_statement_view" type="object" icon="fa-edit" title="Edit" attrs="{'invisible': ['|', ('move_type', '!=', 'entry'), ('statement_id', '=', False)]}"/>
-                        <button name="open_payment_view" type="object" icon="fa-edit" title="Edit" attrs="{'invisible': ['|', ('move_type', '!=', 'entry'), ('payment_id', '=', False)]}"/>
-                    </groupby>
                </tree>
            </field>
        </record>
@@ -252,11 +192,10 @@
            <field name="name">account.move.line.tree.grouped.sales.purchase</field>
            <field name="model">account.move.line</field>
            <field name="mode">primary</field>
-            <field name="inherit_id" ref="account.view_move_line_tree_grouped"/>
+            <field name="inherit_id" ref="account.view_move_line_tree"/>
            <field name="arch" type="xml">
                <field name="date" position="attributes"><attribute name="optional">hide</attribute></field>
-                <field name="move_id" position="attributes"><attribute name="optional">hide</attribute></field>
-                <field name="tax_ids" position="attributes"><attribute name="optional">show</attribute></field>
+                <field name="move_name" position="attributes"><attribute name="optional">hide</attribute></field>
                <field name="tax_tag_ids" position="attributes"><attribute name="optional">show</attribute></field>
            </field>
        </record>
@@ -265,11 +204,10 @@
            <field name="name">account.move.line.tree.grouped.bank.cash</field>
            <field name="model">account.move.line</field>
            <field name="mode">primary</field>
-            <field name="inherit_id" ref="account.view_move_line_tree_grouped"/>
+            <field name="inherit_id" ref="account.view_move_line_tree"/>
            <field name="arch" type="xml">
                <field name="date" position="attributes"><attribute name="optional">hide</attribute></field>
-                <field name="move_id" position="attributes"><attribute name="optional">hide</attribute></field>
-                <field name="ref" position="attributes"><attribute name="optional">show</attribute></field>
+                <field name="move_name" position="attributes"><attribute name="optional">hide</attribute></field>
            </field>
        </record>

@@ -277,10 +215,10 @@
            <field name="name">account.move.line.tree.grouped.misc</field>
            <field name="model">account.move.line</field>
            <field name="mode">primary</field>
-            <field name="inherit_id" ref="account.view_move_line_tree_grouped"/>
+            <field name="inherit_id" ref="account.view_move_line_tree"/>
            <field name="arch" type="xml">
                <field name="date" position="attributes"><attribute name="optional">hide</attribute></field>
-                <field name="move_id" position="attributes"><attribute name="optional">hide</attribute></field>
+                <field name="move_name" position="attributes"><attribute name="optional">hide</attribute></field>
            </field>
        </record>

@@ -288,15 +226,11 @@
            <field name="name">account.move.line.tree.grouped.misc</field>
            <field name="model">account.move.line</field>
            <field name="mode">primary</field>
-            <field name="inherit_id" ref="account.view_move_line_tree_grouped"/>
+            <field name="inherit_id" ref="account.view_move_line_tree"/>
            <field name="arch" type="xml">
-                <field name="account_id" position="attributes">
-                    <attribute name="optional">hide</attribute>
-                </field>
+                <field name="account_id" position="attributes"><attribute name="optional">hide</attribute></field>
                <field name="balance" position="attributes"><attribute name="optional">show</attribute></field>
-                <field name="balance" position="after">
-                    <field name="cumulated_balance" optional="show"/>
-                </field>
+                <field name="cumulated_balance" position="attributes"><attribute name="optional">show</attribute></field>
            </field>
        </record>

@@ -305,14 +239,12 @@
            <field name="name">account.move.line.tree.grouped.partner</field>
            <field name="model">account.move.line</field>
            <field name="mode">primary</field>
-            <field name="inherit_id" ref="account.view_move_line_tree_grouped"/>
+            <field name="inherit_id" ref="account.view_move_line_tree"/>
            <field name="arch" type="xml">
                <field name="partner_id" position="attributes"><attribute name="optional">hide</attribute></field>
                <field name="date_maturity" position="attributes"><attribute name="optional">show</attribute></field>
                <field name="balance" position="attributes"><attribute name="optional">show</attribute></field>
-                <field name="balance" position="after">
-                    <field name="cumulated_balance" optional="show"/>
-                </field>
+                <field name="cumulated_balance" position="attributes"><attribute name="optional">show</attribute></field>
            </field>
        </record>

@@ -322,15 +254,12 @@
            <field name="mode">primary</field>
            <field name="inherit_id" ref="account.view_move_line_tree"/>
            <field name="arch" type="xml">
-                <field name="move_id" position="replace"/>
+                <field name="move_name" position="replace"/>
                <field name="matching_number" position="replace">
                    <field name="tax_line_id" string="Tax"/>
                    <field name="tax_base_amount" sum="Total Base Amount"/>
                    <field name="tax_audit"/>
-                    <field name="move_id"/>
-                </field>
-                <field name="date_maturity" position="attributes">
-                    <attribute name="optional">hide</attribute>
+                    <field name="move_name"/>
                </field>
                <field name="analytic_account_id" position="attributes">
                    <attribute name="optional">hide</attribute>
@@ -344,7 +273,7 @@
                <field name="journal_id" position="attributes">
                    <attribute name="optional">show</attribute>
                </field>
-                <field name="move_id" position="attributes">
+                <field name="move_name" position="attributes">
                    <attribute name="optional">hide</attribute>
                </field>
            </field>
@@ -398,8 +327,9 @@
                    <separator/>
                    <filter string="Payable" domain="[('account_id.internal_type', '=', 'payable'), ('account_id.non_trade', '=', False)]" help="From Trade Payable accounts" name="trade_payable"/>
                    <filter string="Receivable" domain="[('account_id.internal_type', '=', 'receivable'), ('account_id.non_trade', '=', False)]" help="From Trade Receivable accounts" name="trade_receivable"/>
-                    <filter string="Non Trade Payable" domain="[('account_id.internal_type', '=', 'payable'), ('account_id.non_trade', '=', True)]" help="From Non Trade Receivable accounts" name="non_trade_payable"/>
-                    <filter string="Non Trade Receivable" domain="[('account_id.internal_type', '=', 'receivable'), ('account_id.non_trade', '=', True)]" help="From Non Trade Receivable accounts" name="non_trade_receivable"/>
+                    <filter string="Non Trade Payable" domain="[('account_id.internal_type', '=', 'payable'), ('account_id.non_trade', '=', True)]" help="From Non Trade Receivable accounts" name="non_trade_payable" invisible="1"/>
+                    <filter string="Non Trade Receivable" domain="[('account_id.internal_type', '=', 'receivable'), ('account_id.non_trade', '=', True)]" help="From Non Trade Receivable accounts" name="non_trade_receivable" invisible="1"/>
+                    <filter string="P&amp;L Accounts" domain="[('account_id.internal_group', 'in', ('income', 'expense'))]" help="From P&amp;L accounts" name="pl_accounts"/>
                    <separator/>
                    <filter string="Date" name="date" date="date"/>
                    <separator/>
@@ -407,15 +337,13 @@
                    <separator/>
                    <filter string="Report Analytic Accounts" name="analytic_accounts" domain="[('analytic_account_id', 'in', context.get('analytic_ids'))]" invisible="1"/>
                    <group expand="0" string="Group By">
-                        <filter string="Journal Entry" name="group_by_move" domain="[]" context="{'group_by': 'move_id'}"/>
-                        <filter string="Taxes" name="group_by_taxes" domain="[]" context="{'group_by': 'tax_ids'}"/>
-                        <filter string="Tax Tags" name="group_by_tax_tags" domain="[]" context="{'group_by': 'tax_tag_ids'}"/>
+                        <filter string="Journal Entry" name="group_by_move" domain="[]" context="{'group_by': 'move_name'}"/>
                        <filter string="Account" name="group_by_account" domain="[]" context="{'group_by': 'account_id'}"/>
                        <filter string="Partner" name="group_by_partner" domain="[]" context="{'group_by': 'partner_id'}"/>
                        <filter string="Journal" name="journal" domain="[]" context="{'group_by': 'journal_id'}"/>
                        <filter string="Date" name="groupby_date" domain="[]" context="{'group_by': 'date'}"/>
                        <filter string="Taxes" name="group_by_taxes" domain="[]" context="{'group_by': 'tax_ids'}"/>
-                        <filter string="Tax Grid" name="group_by_tax_grid" domain="[]" context="{'group_by': 'tax_tag_ids'}"/>
+                        <filter string="Tax Grid" name="group_by_tax_tags" domain="[]" context="{'group_by': 'tax_tag_ids'}"/>
                        <filter string="Matching #" name="group_by_matching" domain="[]" context="{'group_by': 'full_reconcile_id'}"/>
                    </group>
                </search>
@@ -1453,11 +1381,11 @@
        </record>

        <record id="action_account_moves_all_a" model="ir.actions.act_window">
-            <field name="context">{'journal_type':'general', 'search_default_group_by_move': 1, 'search_default_posted':1, 'name_groupby':1, 'create':0}</field>
+            <field name="context">{'journal_type':'general', 'search_default_group_by_move': 1, 'search_default_posted':1, 'create':0}</field>
            <field name="name">Journal Items</field>
            <field name="res_model">account.move.line</field>
            <field name="domain">[('display_type', 'not in', ('line_section', 'line_note'))]</field>
-            <field name="view_id" ref="view_move_line_tree_grouped"/>
+            <field name="view_id" ref="view_move_line_tree"/>
            <field name="view_mode">tree,pivot,graph,kanban</field>
        </record>

@@ -1466,12 +1394,12 @@
            <field name="name">Journal Items</field>
            <field name="res_model">account.move.line</field>
            <field name="domain">[('display_type', 'not in', ('line_section', 'line_note'))]</field>
-            <field name="view_id" ref="view_move_line_tree_grouped"/>
+            <field name="view_id" ref="view_move_line_tree"/>
            <field name="view_mode">tree,pivot,graph,kanban</field>
        </record>

        <record id="action_account_moves_journal_sales" model="ir.actions.act_window">
-            <field name="context">{'journal_type':'sales', 'search_default_group_by_move': 1, 'search_default_posted':1, 'search_default_sales':1, 'name_groupby':1, 'expand': 1}</field>
+            <field name="context">{'journal_type':'sales', 'search_default_group_by_move': 1, 'search_default_posted':1, 'search_default_sales':1, 'expand': 1}</field>
            <field name="name">Sales</field>
            <field name="res_model">account.move.line</field>
            <field name="domain">[('display_type', 'not in', ('line_section', 'line_note'))]</field>
@@ -1480,7 +1408,7 @@
        </record>

        <record id="action_account_moves_journal_purchase" model="ir.actions.act_window">
-            <field name="context">{'journal_type':'purchase', 'search_default_group_by_move': 1, 'search_default_posted':1, 'search_default_purchases':1, 'name_groupby':1, 'expand': 1}</field>
+            <field name="context">{'journal_type':'purchase', 'search_default_group_by_move': 1, 'search_default_posted':1, 'search_default_purchases':1, 'expand': 1}</field>
            <field name="name">Purchases</field>
            <field name="res_model">account.move.line</field>
            <field name="domain">[('display_type', 'not in', ('line_section', 'line_note'))]</field>
@@ -1489,7 +1417,7 @@
        </record>

        <record id="action_account_moves_journal_bank_cash" model="ir.actions.act_window">
-            <field name="context">{'journal_type':'bank', 'search_default_group_by_move': 1, 'search_default_posted':1, 'search_default_bank':1, 'search_default_cash':1, 'name_groupby':1, 'expand': 1}</field>
+            <field name="context">{'journal_type':'bank', 'search_default_group_by_move': 1, 'search_default_posted':1, 'search_default_bank':1, 'search_default_cash':1, 'expand': 1}</field>
            <field name="name">Bank and Cash</field>
            <field name="res_model">account.move.line</field>
            <field name="domain">[('display_type', 'not in', ('line_section', 'line_note'))]</field>
@@ -1498,7 +1426,7 @@
        </record>

        <record id="action_account_moves_journal_misc" model="ir.actions.act_window">
-            <field name="context">{'journal_type':'general', 'search_default_group_by_move': 1, 'search_default_posted':1, 'search_default_misc_filter':1, 'name_groupby':1, 'expand': 1}</field>
+            <field name="context">{'journal_type':'general', 'search_default_group_by_move': 1, 'search_default_posted':1, 'search_default_misc_filter':1, 'expand': 1}</field>
            <field name="name">Miscellaneous</field>
            <field name="res_model">account.move.line</field>
            <field name="domain">[('display_type', 'not in', ('line_section', 'line_note'))]</field>
@@ -1415,13 +1415,12 @@ class PosSession(models.Model):
            'type': 'ir.actions.act_window',
            'res_model': 'account.move.line',
            'view_mode': 'tree',
-            'view_id':self.env.ref('account.view_move_line_tree_grouped').id,
+            'view_id':self.env.ref('account.view_move_line_tree').id,
            'domain': [('id', 'in', all_related_moves.mapped('line_ids').ids)],
            'context': {
                'journal_type':'general',
                'search_default_group_by_move': 1,
                'group_by':'move_id', 'search_default_posted':1,
-                'name_groupby':1,
            },
        }