chore: resolve conflicts, remove additional new fields

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -10,14 +10,8 @@ from frappe import ValidationError, _, qb, scrub, throw
 from frappe.query_builder import Tuple
 from frappe.query_builder.functions import Count
 from frappe.utils import cint, comma_or, flt, getdate, nowdate
-<<<<<<< HEAD
-from frappe.utils.data import comma_and, fmt_money
-from pypika.functions import Sum
-=======
 from frappe.utils.data import comma_and, fmt_money, get_link_to_form
-from pypika import Case
 from pypika.functions import Coalesce, Sum
->>>>>>> ea69ba7cd8 (fix: multiple issues in Payment Request (#42427))
 
 import erpnext
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_dimensions

erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json

@@ -11,15 +11,12 @@
   "bill_no",
   "payment_term",
   "payment_term_outstanding",
-  "account_type",
-  "payment_type",
   "column_break_4",
   "total_amount",
   "outstanding_amount",
   "allocated_amount",
   "exchange_rate",
   "exchange_gain_loss",
-  "account",
   "payment_request",
   "payment_request_outstanding"
  ],
@@ -108,22 +105,6 @@
    "options": "Company:company:default_currency",
    "read_only": 1
   },
-  {
-   "fieldname": "account",
-   "fieldtype": "Link",
-   "label": "Account",
-   "options": "Account"
-  },
-  {
-   "fieldname": "account_type",
-   "fieldtype": "Data",
-   "label": "Account Type"
-  },
-  {
-   "fieldname": "payment_type",
-   "fieldtype": "Data",
-   "label": "Payment Type"
-  },
   {
    "fieldname": "payment_request",
    "fieldtype": "Link",

erpnext/accounts/doctype/payment_request/payment_request.json

@@ -396,15 +396,6 @@
    "label": "Project",
    "options": "Project"
   },
-  {
-   "fieldname": "failed_reason",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Reason for Failure",
-   "no_copy": 1,
-   "print_hide": 1,
-   "read_only": 1
-  },
   {
    "depends_on": "eval: doc.docstatus === 1",
    "description": "Amount in party's bank account currency",
@@ -416,13 +407,6 @@
    "options": "party_account_currency",
    "read_only": 1
   },
-  {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "label": "Company",
-   "options": "Company",
-   "read_only": 1
-  },
   {
    "fieldname": "party_account_currency",
    "fieldtype": "Link",