From 5432472ff4a5b12d706395d2de00f4b7a52cbce6 Mon Sep 17 00:00:00 2001
From: Karthikeyan <karthikeyansp91@gmail.com>
Date: Mon, 25 Mar 2024 06:49:51 +0530
Subject: [PATCH] [Karthi] | BAH-3713 | Added. Additional display fields to be
 added in invoices page(Amount Due) and payments page(Cashier), payment view
 search and group by added cashier field (#116)

---
 bahmni_account/__manifest__.py                |  1 +
 bahmni_account/views/account_invoice_view.xml |  3 +++
 bahmni_account/views/account_payment_view.xml | 27 +++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 bahmni_account/views/account_payment_view.xml

diff --git a/bahmni_account/__manifest__.py b/bahmni_account/__manifest__.py
index 684f032..8e08caf 100644
--- a/bahmni_account/__manifest__.py
+++ b/bahmni_account/__manifest__.py
@@ -16,6 +16,7 @@
              'views/company_view.xml',
 	         'views/account_report.xml',
              'report/report_invoice_inherit.xml',
+             'views/account_payment_view.xml',
              ],
     'demo': [],
     'qweb': [],
diff --git a/bahmni_account/views/account_invoice_view.xml b/bahmni_account/views/account_invoice_view.xml
index d2728b7..6d96de2 100644
--- a/bahmni_account/views/account_invoice_view.xml
+++ b/bahmni_account/views/account_invoice_view.xml
@@ -61,6 +61,9 @@
 			<xpath expr="//field[@name='name']" position="after">
 				<field name="partner_id"/>				
 			</xpath>
+			<xpath expr="//field[@name='payment_state']" position="before">
+				<field name="amount_residual"/>				
+			</xpath>
 		</field>
 	</record>
 	
diff --git a/bahmni_account/views/account_payment_view.xml b/bahmni_account/views/account_payment_view.xml
new file mode 100644
index 0000000..c9c9c30
--- /dev/null
+++ b/bahmni_account/views/account_payment_view.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+	
+	<record id="inherit_view_account_payment_tree_bahmni" model="ir.ui.view">
+		<field name="name">Payment View Changes</field>
+		<field name="model">account.payment</field>
+		<field name="inherit_id" ref="account.view_account_payment_tree"/>
+		<field name="arch" type="xml">
+			<xpath expr="//field[@name='partner_id']" position="after">
+				<field name="create_uid" string="Cashier"/>				
+			</xpath>			
+		</field>
+	</record>
+	
+	<record id="inherit_view_account_payment_search_bahmni" model="ir.ui.view">
+		<field name="name">Payment Search View Changes</field>
+		<field name="model">account.payment</field>
+		<field name="inherit_id" ref="account.view_account_payment_search"/>
+		<field name="arch" type="xml">
+			<search string="Payments">
+				<field name="create_uid" string="Cashier"/>
+				<filter string="Cashier" name="create_uid" domain="[]" context="{'group_by': 'create_uid'}"/>
+			</search>				
+		</field>
+	</record>
+	
+</odoo>