diff --git a/modules/account/move.py b/modules/account/move.py
index 548d458937..b09831934c 100644
--- a/modules/account/move.py
+++ b/modules/account/move.py
@@ -711,6 +711,10 @@ class Reconciliation(ModelSQL, ModelView):
 class MoveLineMixin:
     __slots__ = ()
 
+    payable_receivable_date = fields.Function(
+        fields.Date("Payable/Receivable Date"),
+        'on_change_with_payable_receivable_date')
+
     @classmethod
     def get_move_origin(cls):
         Move = Pool().get('account.move')
@@ -1077,9 +1081,6 @@ class Line(DescriptionOriginMixin, MoveLineMixin, ModelSQL, ModelView):
                 }),
         'get_delegated_amount')
 
-    payable_receivable_date = fields.Function(
-        fields.Date("Payable/Receivable Date"),
-        'on_change_with_payable_receivable_date')
     payable_receivable_balance = fields.Function(
         Monetary(
             "Payable/Receivable Balance",
diff --git a/modules/account_move_line_grouping/account.xml b/modules/account_move_line_grouping/account.xml
index 0dc20d4930..9d3058be08 100644
--- a/modules/account_move_line_grouping/account.xml
+++ b/modules/account_move_line_grouping/account.xml
@@ -84,7 +84,7 @@ this repository contains the full copyright notices and license terms. -->
                 eval="[('company', '=', Eval('company', -1)), ['OR', If(Eval('receivable', True), ('account.type.receivable', '=', True), ('id', '<', 0)), If(Eval('payable', True), ('account.type.payable', '=', True), ('id', '<', 0))], If(Eval('reconciled', False), (), ('reconciled', '=', False))]"
                 pyson="1"/>
             <field name="search_value"></field>
-            <field name="order" eval="[('maturity_date', 'ASC'), ('date', 'DESC'), ('id', 'DESC')]" pyson="1"/>
+            <field name="order" eval="[('payable_receivable_date', 'ASC NULLS FIRST'), ('date', 'DESC'), ('id', 'DESC')]" pyson="1"/>
         </record>
         <record model="ir.action.act_window.view" id="act_move_line_group_payable_receivable_view1">
             <field name="sequence" eval="10"/>
diff --git a/modules/account_move_line_grouping/view/move_line_group_form_payable_receivable.xml b/modules/account_move_line_grouping/view/move_line_group_form_payable_receivable.xml
index 8d782a3095..06d109e6da 100644
--- a/modules/account_move_line_grouping/view/move_line_group_form_payable_receivable.xml
+++ b/modules/account_move_line_grouping/view/move_line_group_form_payable_receivable.xml
@@ -4,8 +4,8 @@ this repository contains the full copyright notices and license terms. -->
 <form>
     <label name="party"/>
     <field name="party"/>
-    <label name="maturity_date"/>
-    <field name="maturity_date"/>
+    <label name="payable_receivable_date"/>
+    <field name="payable_receivable_date" string="Date"/>
 
     <label name="amount"/>
     <field name="amount"/>
diff --git a/modules/account_move_line_grouping/view/move_line_group_list_payabale_receivable.xml b/modules/account_move_line_grouping/view/move_line_group_list_payabale_receivable.xml
index 0dddcf0ab7..9a7e865931 100644
--- a/modules/account_move_line_grouping/view/move_line_group_list_payabale_receivable.xml
+++ b/modules/account_move_line_grouping/view/move_line_group_list_payabale_receivable.xml
@@ -3,7 +3,7 @@
 this repository contains the full copyright notices and license terms. -->
 <tree>
     <field name="company" expand="1" optional="1"/>
-    <field name="maturity_date"/>
+    <field name="payable_receivable_date" string="Date"/>
     <field name="party"/>
     <field name="amount"/>
     <field name="payable_receivable_balance" string="Balance"/>