From 12834ccf9aebb7c53e3eeafb4a5747b09da5eb77 Mon Sep 17 00:00:00 2001 From: Nihantra Patel Date: Wed, 7 Aug 2024 16:48:29 +0530 Subject: [PATCH 1/2] fix: add the company in payment request bcz delete company transactions --- .../doctype/payment_request/payment_request.json | 10 +++++++++- .../doctype/payment_request/payment_request.py | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json index 7674712374c..acfa9967e96 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.json +++ b/erpnext/accounts/doctype/payment_request/payment_request.json @@ -10,6 +10,7 @@ "failed_reason", "column_break_2", "naming_series", + "company", "mode_of_payment", "party_details", "party_type", @@ -400,13 +401,20 @@ "no_copy": 1, "print_hide": 1, "read_only": 1 + }, + { + "fieldname": "company", + "fieldtype": "Link", + "label": "Company", + "options": "Company", + "read_only": 1 } ], "in_create": 1, "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2024-06-20 13:54:55.245774", + "modified": "2024-08-07 16:39:54.288002", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Request", diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index 814b56f79bc..e311dd63d36 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -85,6 +85,7 @@ class PaymentRequest(Document): subscription_plans: DF.Table[SubscriptionPlanDetail] swift_number: DF.ReadOnly | None transaction_date: DF.Date | None + company: DF.Link | None # end: auto-generated types def validate(self): From e3008843d15ef0301c3171250bfcd81db738e5ae Mon Sep 17 00:00:00 2001 From: "Nihantra C. Patel" <141945075+Nihantra-Patel@users.noreply.github.com> Date: Thu, 29 Aug 2024 14:42:45 +0530 Subject: [PATCH 2/2] fix: link company when make payment request --- erpnext/accounts/doctype/payment_request/payment_request.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index e311dd63d36..6ef5efc76d7 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -489,6 +489,7 @@ def make_payment_request(**args): "message": gateway_account.get("message") or get_dummy_message(ref_doc), "reference_doctype": args.dt, "reference_name": args.dn, + "company": ref_doc.get("company"), "party_type": args.get("party_type") or "Customer", "party": args.get("party") or ref_doc.get("customer"), "bank_account": bank_account,