From 910bf259975eb8b6ecc840e448e6bc1c3977f314 Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Mon, 22 Jan 2024 10:45:59 +0100 Subject: [PATCH 1/4] fix: Allow rename sepa direct debit settings --- .../sepa_direct_debit_settings.json | 11 +++++++++-- .../sepa_direct_debit_settings.py | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) 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 53e016a0a0d..9a6e1f7a77f 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", @@ -89,8 +90,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 10:45:29.501604", "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 3d2027b8bdc..9e5eaf3cc00 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( -- GitLab From 8c053f0ea11d4871d1df8ce09eb2e386b48cbbb9 Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Mon, 22 Jan 2024 11:07:04 +0100 Subject: [PATCH 2/4] fix: Allow editing bank account in payment order reference --- .../payment_order_reference/payment_order_reference.json | 3 +-- .../doctype/payment_order_reference/payment_order_reference.py | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) 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 a51f3024e91..a575de74950 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 9870bd2f7f8..8183e266a3c 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 -- GitLab From 928069623af73b38a6c4083938a48255224bbfd8 Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Mon, 22 Jan 2024 11:11:32 +0100 Subject: [PATCH 3/4] fix: Company is not unique anymore --- .../sepa_direct_debit_settings.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 9a6e1f7a77f..f04ea9934b4 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 @@ -61,8 +61,7 @@ "fieldtype": "Link", "label": "Company", "options": "Company", - "reqd": 1, - "unique": 1 + "reqd": 1 }, { "default": "CORE", @@ -97,7 +96,7 @@ "link_fieldname": "settings" } ], - "modified": "2024-01-22 10:45:29.501604", + "modified": "2024-01-22 11:08:42.574496", "modified_by": "Administrator", "module": "Accounts", "name": "Sepa Direct Debit Settings", -- GitLab From b0035aeb432776ed2b891413c1fab1c3dac0014f Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Mon, 22 Jan 2024 11:14:20 +0100 Subject: [PATCH 4/4] fix: Missing select in subquery --- erpnext/accounts/doctype/sepa_direct_debit/sepa_direct_debit.py | 1 + 1 file changed, 1 insertion(+) 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 e2f246f897f..f340ca55707 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) ) -- GitLab