diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json index af1524de114..85354d6ca1c 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.json +++ b/erpnext/accounts/doctype/payment_request/payment_request.json @@ -371,6 +371,7 @@ "read_only": 1 }, { +<<<<<<< HEAD <<<<<<< HEAD "fetch_from": "payment_gateway_account.payment_channel", "fieldname": "payment_channel", @@ -410,6 +411,8 @@ "read_only": 1 }, { +======= +>>>>>>> e785928c0f (fix: Remove unused field) "depends_on": "eval: doc.docstatus === 1", "description": "Amount in party's bank account currency", "fieldname": "outstanding_amount", @@ -487,4 +490,4 @@ "sort_field": "modified", "sort_order": "DESC", "states": [] -} \ No newline at end of file +} diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index e4540de11bf..c81df6f99c8 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -62,7 +62,6 @@ class PaymentRequest(Document): cost_center: DF.Link | None currency: DF.Link | None email_to: DF.Data | None - failed_reason: DF.Data | None grand_total: DF.Currency iban: DF.ReadOnly | None is_a_subscription: DF.Check