diff --git a/erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json b/erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json index a51f3024e9161eaede6a3e31619be7500bccf602..a575de749503f7f44ebcb107fb0b3584472e9dd9 100644 --- a/erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json +++ b/erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json @@ -87,7 +87,6 @@ "in_list_view": 1, "label": "Bank Account", "options": "Bank Account", - "read_only": 1, "reqd": 1 }, { @@ -120,7 +119,7 @@ ], "istable": 1, "links": [], - "modified": "2023-11-28 18:21:42.040208", + "modified": "2024-01-22 11:06:28.261241", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Order Reference", diff --git a/erpnext/accounts/doctype/payment_order_reference/payment_order_reference.py b/erpnext/accounts/doctype/payment_order_reference/payment_order_reference.py index 9870bd2f7f8fc9b8904bc7c2ddd051ac9f79a38c..8183e266a3c7c4a85b5e04124b6e80b039a00598 100644 --- a/erpnext/accounts/doctype/payment_order_reference/payment_order_reference.py +++ b/erpnext/accounts/doctype/payment_order_reference/payment_order_reference.py @@ -28,4 +28,5 @@ class PaymentOrderReference(Document): reference_name: DF.DynamicLink supplier: DF.Link | None # end: auto-generated types + pass diff --git a/erpnext/accounts/doctype/sepa_direct_debit/sepa_direct_debit.py b/erpnext/accounts/doctype/sepa_direct_debit/sepa_direct_debit.py index e2f246f897f130d8a9808ab8c3803c9af9e19e1b..f340ca55707b12f5fa9baa25a7df3bd7cfaa1b20 100644 --- a/erpnext/accounts/doctype/sepa_direct_debit/sepa_direct_debit.py +++ b/erpnext/accounts/doctype/sepa_direct_debit/sepa_direct_debit.py @@ -82,6 +82,7 @@ class SepaDirectDebit(Document): sepa_direct_debit_details = frappe.qb.DocType("Sepa Direct Debit Details") subquery = ( frappe.qb.from_(sepa_direct_debit_details) + .select(sepa_direct_debit_details.name) .where(sepa_direct_debit_details.payment_document == "Payment Entry") .where(sepa_direct_debit_details.payment_entry == payment_entry.name) ) diff --git a/erpnext/accounts/doctype/sepa_direct_debit_settings/sepa_direct_debit_settings.json b/erpnext/accounts/doctype/sepa_direct_debit_settings/sepa_direct_debit_settings.json index 53e016a0a0d8150b6aaa1821c432b4e6d7d3bff6..f04ea9934b4586b92968e69b2f178b6511f37926 100644 --- a/erpnext/accounts/doctype/sepa_direct_debit_settings/sepa_direct_debit_settings.json +++ b/erpnext/accounts/doctype/sepa_direct_debit_settings/sepa_direct_debit_settings.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_rename": 1, "autoname": "format:{company}-{schema}", "creation": "2019-10-11 09:17:33.294941", "doctype": "DocType", @@ -60,8 +61,7 @@ "fieldtype": "Link", "label": "Company", "options": "Company", - "reqd": 1, - "unique": 1 + "reqd": 1 }, { "default": "CORE", @@ -89,8 +89,14 @@ } ], "index_web_pages_for_search": 1, - "links": [], - "modified": "2023-11-27 12:17:08.876108", + "links": [ + { + "group": "Sepa Direct Debit", + "link_doctype": "Sepa Direct Debit", + "link_fieldname": "settings" + } + ], + "modified": "2024-01-22 11:08:42.574496", "modified_by": "Administrator", "module": "Accounts", "name": "Sepa Direct Debit Settings", diff --git a/erpnext/accounts/doctype/sepa_direct_debit_settings/sepa_direct_debit_settings.py b/erpnext/accounts/doctype/sepa_direct_debit_settings/sepa_direct_debit_settings.py index 3d2027b8bdcdb240230595d2f53a0c16ddd7eff2..9e5eaf3cc0064bfe74a9bf0ff941c1a2432f7fa4 100644 --- a/erpnext/accounts/doctype/sepa_direct_debit_settings/sepa_direct_debit_settings.py +++ b/erpnext/accounts/doctype/sepa_direct_debit_settings/sepa_direct_debit_settings.py @@ -24,6 +24,7 @@ class SepaDirectDebitSettings(Document): reference_prefix: DF.Data schema: DF.Literal["pain.008.001.02", "pain.001.001.03"] # end: auto-generated types + def validate(self): if self.bank_account: iban, swift_number = frappe.db.get_value(