mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-09 08:11:19 +00:00
fix: Remove unused field
(cherry picked from commit e785928c0f)
# Conflicts:
# erpnext/accounts/doctype/payment_request/payment_request.json
This commit is contained in:
committed by
Mergify
parent
7d0a094515
commit
3a51cf4e1a
@@ -371,6 +371,7 @@
|
|||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
"fetch_from": "payment_gateway_account.payment_channel",
|
"fetch_from": "payment_gateway_account.payment_channel",
|
||||||
"fieldname": "payment_channel",
|
"fieldname": "payment_channel",
|
||||||
@@ -410,6 +411,8 @@
|
|||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
=======
|
||||||
|
>>>>>>> e785928c0f (fix: Remove unused field)
|
||||||
"depends_on": "eval: doc.docstatus === 1",
|
"depends_on": "eval: doc.docstatus === 1",
|
||||||
"description": "Amount in party's bank account currency",
|
"description": "Amount in party's bank account currency",
|
||||||
"fieldname": "outstanding_amount",
|
"fieldname": "outstanding_amount",
|
||||||
|
|||||||
@@ -62,7 +62,6 @@ class PaymentRequest(Document):
|
|||||||
cost_center: DF.Link | None
|
cost_center: DF.Link | None
|
||||||
currency: DF.Link | None
|
currency: DF.Link | None
|
||||||
email_to: DF.Data | None
|
email_to: DF.Data | None
|
||||||
failed_reason: DF.Data | None
|
|
||||||
grand_total: DF.Currency
|
grand_total: DF.Currency
|
||||||
iban: DF.ReadOnly | None
|
iban: DF.ReadOnly | None
|
||||||
is_a_subscription: DF.Check
|
is_a_subscription: DF.Check
|
||||||
|
|||||||
Reference in New Issue
Block a user