From ca06d3ddb8c73b9c46ebbf2cd4e8544b338ea642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Fri, 4 Aug 2023 17:38:37 +0200
Subject: [PATCH] Create different menu entries for receivable and payable
 payments

---
 modules/account_payment/payment.py  |   9 +++
 modules/account_payment/payment.xml | 107 +++++++++++++++++++++-------
 2 files changed, 90 insertions(+), 26 deletions(-)

diff --git a/modules/account_payment/payment.py b/modules/account_payment/payment.py
index 57a6725cb4..0b38a427f3 100644
--- a/modules/account_payment/payment.py
+++ b/modules/account_payment/payment.py
@@ -527,6 +527,15 @@ class Payment(Workflow, ModelSQL, ModelView):
         field_name = 'process_method'
         return Journal.fields_get([field_name])[field_name]['selection']
 
+    @classmethod
+    def view_attributes(cls):
+        context = Transaction().context
+        attributes = super().view_attributes()
+        if context.get('kind') == 'receivable':
+            attributes.append(
+                ('/tree//button[@name="approve"]', 'tree_invisible', True))
+        return attributes
+
     @classmethod
     def copy(cls, payments, default=None):
         if default is None:
diff --git a/modules/account_payment/payment.xml b/modules/account_payment/payment.xml
index d0975d0fac..45d161e90b 100644
--- a/modules/account_payment/payment.xml
+++ b/modules/account_payment/payment.xml
@@ -242,58 +242,113 @@ this repository contains the full copyright notices and license terms. -->
             <field name="view" ref="payment_view_form"/>
             <field name="act_window" ref="act_payment_form"/>
         </record>
-        <record model="ir.action.act_window.domain" id="act_payment_form_domain_draft">
+
+        <record model="ir.action.act_window" id="act_payment_form_payable">
+            <field name="name">Payable Payments</field>
+            <field name="res_model">account.payment</field>
+            <field name="domain" eval="[('kind', '=', 'payable')]" pyson="1"/>
+            <field name="context" eval="{'kind': 'payable'}" pyson="1"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_payment_form_payable_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="payment_view_list"/>
+            <field name="act_window" ref="act_payment_form_payable"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_payment_form_payable_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="payment_view_form"/>
+            <field name="act_window" ref="act_payment_form_payable"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_payment_form_payable_domain_draft">
             <field name="name">Draft</field>
             <field name="sequence" eval="10"/>
             <field name="domain" eval="[('state', '=', 'draft')]" pyson="1"/>
             <field name="count" eval="True"/>
-            <field name="act_window" ref="act_payment_form"/>
+            <field name="act_window" ref="act_payment_form_payable"/>
         </record>
-        <record model="ir.action.act_window.domain" id="act_payment_form_domain_to_approve">
+        <record model="ir.action.act_window.domain" id="act_payment_form_payable_domain_to_approve">
             <field name="name">To Approve</field>
             <field name="sequence" eval="20"/>
-            <field name="domain" eval="[('state', '=', 'submitted'), ('kind', '=', 'payable')]" pyson="1"/>
+            <field name="domain" eval="[('state', '=', 'submitted')]" pyson="1"/>
             <field name="count" eval="True"/>
-            <field name="act_window" ref="act_payment_form"/>
+            <field name="act_window" ref="act_payment_form_payable"/>
         </record>
-        <record model="ir.action.act_window.domain" id="act_payment_form_domain_to_process">
+        <record model="ir.action.act_window.domain" id="act_payment_form_payable_domain_to_process">
             <field name="name">To Process</field>
             <field name="sequence" eval="30"/>
-            <field name="domain" eval="['OR', ('state', '=', 'approved'), [('state', '=', 'submitted'), ('kind', '=', 'receivable')]]" pyson="1"/>
+            <field name="domain" eval="[('state', '=', 'approved')]" pyson="1"/>
             <field name="count" eval="True"/>
-            <field name="act_window" ref="act_payment_form"/>
+            <field name="act_window" ref="act_payment_form_payable"/>
         </record>
-        <record model="ir.action.act_window.domain" id="act_payment_form_domain_processing">
+        <record model="ir.action.act_window.domain" id="act_payment_form_payable_domain_processing">
             <field name="name">Processing</field>
             <field name="sequence" eval="40"/>
             <field name="domain" eval="[('state', '=', 'processing')]" pyson="1"/>
             <field name="count" eval="True"/>
-            <field name="act_window" ref="act_payment_form"/>
+            <field name="act_window" ref="act_payment_form_payable"/>
         </record>
-        <record model="ir.action.act_window.domain" id="act_payment_form_domain_suceeded">
-            <field name="name">Succeeded</field>
-            <field name="sequence" eval="50"/>
-            <field name="domain" eval="[('state', '=', 'succeeded')]" pyson="1"/>
-            <field name="act_window" ref="act_payment_form"/>
-        </record>
-        <record model="ir.action.act_window.domain" id="act_payment_form_domain_failed">
-            <field name="name">Failed</field>
-            <field name="sequence" eval="60"/>
-            <field name="domain" eval="[('state', '=', 'failed')]" pyson="1"/>
-            <field name="act_window" ref="act_payment_form"/>
-        </record>
-        <record model="ir.action.act_window.domain" id="act_payment_form_domain_all">
+        <record model="ir.action.act_window.domain" id="act_payment_form_payable_domain_all">
             <field name="name">All</field>
             <field name="sequence" eval="9999"/>
             <field name="domain"></field>
-            <field name="act_window" ref="act_payment_form"/>
+            <field name="act_window" ref="act_payment_form_payable"/>
         </record>
 
         <menuitem
             parent="menu_payments"
-            action="act_payment_form"
+            action="act_payment_form_payable"
             sequence="20"
-            id="menu_payment_form"/>
+            id="menu_payment_form_payable"/>
+
+        <record model="ir.action.act_window" id="act_payment_form_receivable">
+            <field name="name">Receivable Payments</field>
+            <field name="res_model">account.payment</field>
+            <field name="domain" eval="[('kind', '=', 'receivable')]" pyson="1"/>
+            <field name="context" eval="{'kind': 'receivable'}" pyson="1"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_payment_form_receivable_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="payment_view_list"/>
+            <field name="act_window" ref="act_payment_form_receivable"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_payment_form_receivable_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="payment_view_form"/>
+            <field name="act_window" ref="act_payment_form_receivable"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_payment_form_receivable_domain_draft">
+            <field name="name">Draft</field>
+            <field name="sequence" eval="10"/>
+            <field name="domain" eval="[('state', '=', 'draft')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_payment_form_receivable"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_payment_form_receivable_domain_to_process">
+            <field name="name">To Process</field>
+            <field name="sequence" eval="30"/>
+            <field name="domain" eval="[('state', '=', 'submitted')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_payment_form_receivable"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_payment_form_receivable_domain_processing">
+            <field name="name">Processing</field>
+            <field name="sequence" eval="40"/>
+            <field name="domain" eval="[('state', '=', 'processing')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_payment_form_receivable"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_payment_form_receivable_domain_all">
+            <field name="name">All</field>
+            <field name="sequence" eval="9999"/>
+            <field name="domain"></field>
+            <field name="act_window" ref="act_payment_form_receivable"/>
+        </record>
+
+        <menuitem
+            parent="menu_payments"
+            action="act_payment_form_receivable"
+            sequence="10"
+            id="menu_payment_form_receivable"/>
 
         <record model="ir.action.act_window" id="act_payment_form_relate_party">
             <field name="name">Payments</field>