From 3b19568a5695f8aece73528e76138023a01f9fb7 Mon Sep 17 00:00:00 2001
From: Charles-Henri Decultot <chdecultot@dokos.io>
Date: Tue, 4 Feb 2025 10:39:06 +0100
Subject: [PATCH 1/2] fix: translatable strings

---
 .../payment_request/payment_request.py        |  6 +++-
 .../address_and_contacts.py                   |  2 +-
 erpnext/setup/doctype/company/company.py      | 33 ++++++++++---------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py
index 32020b88772..af9a58a08f2 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/payment_request.py
@@ -663,7 +663,11 @@ class PaymentRequest(Document):
 @frappe.whitelist(allow_guest=True)
 def make_payment_request(*args, **kwargs):
 	"""Make payment request"""
-	args = frappe._dict(kwargs)
+
+	args = frappe._dict(args)
+	if args.dt not in ALLOWED_DOCTYPES_FOR_PAYMENT_REQUEST:
+		frappe.throw(_("Payment Requests cannot be created against: {0}").format(frappe.bold(_(args.dt))))
+
 	ref_doc = args.ref_doc or frappe.get_doc(args.dt, args.dn)
 
 	if ref_doc.doctype not in ALLOWED_DOCTYPES_FOR_PAYMENT_REQUEST:
diff --git a/erpnext/selling/report/address_and_contacts/address_and_contacts.py b/erpnext/selling/report/address_and_contacts/address_and_contacts.py
index ba1d7551e62..bbe88bf18a7 100644
--- a/erpnext/selling/report/address_and_contacts/address_and_contacts.py
+++ b/erpnext/selling/report/address_and_contacts/address_and_contacts.py
@@ -42,7 +42,7 @@ def get_columns(filters):
 		_("Phone"),
 		_("Mobile No"),
 		_("Email Id"),
-		_("{}:Check").format(_("Is Primary Contact")),
+		"{}:Check".format(_("Is Primary Contact")),
 	]
 	# @dokos
 	if filters.get("party_type") == "Supplier" and frappe.db.get_single_value(
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 62d90693ff6..6e99549264c 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -919,19 +919,20 @@ def get_billing_shipping_address(name, billing_address=None, shipping_address=No
 
 @frappe.whitelist()
 def create_transaction_deletion_request(company):
-	from erpnext.setup.doctype.transaction_deletion_record.transaction_deletion_record import (
-		is_deletion_doc_running,
-	)
-
-	is_deletion_doc_running(company)
-
-	tdr = frappe.get_doc({"doctype": "Transaction Deletion Record", "company": company})
-	tdr.submit()
-	tdr.start_deletion_tasks()
-
-	frappe.msgprint(
-		_("A Transaction Deletion Document: {0} is triggered for {0}").format(
-			get_link_to_form("Transaction Deletion Record", tdr.name)
-		),
-		frappe.bold(company),
-	)
+	return
+	# from erpnext.setup.doctype.transaction_deletion_record.transaction_deletion_record import (
+	# 	is_deletion_doc_running,
+	# )
+
+	# is_deletion_doc_running(company)
+
+	# tdr = frappe.get_doc({"doctype": "Transaction Deletion Record", "company": company})
+	# tdr.submit()
+	# tdr.start_deletion_tasks()
+
+	# frappe.msgprint(
+	# 	_("A Transaction Deletion Document: {0} is triggered for {0}").format(
+	# 		get_link_to_form("Transaction Deletion Record", tdr.name)
+	# 	),
+	# 	frappe.bold(company),
+	# )
-- 
GitLab


From 73b22b2c096494d317d106684493b9fef8c558ba Mon Sep 17 00:00:00 2001
From: Charles-Henri Decultot <chdecultot@dokos.io>
Date: Tue, 4 Feb 2025 16:15:36 +0000
Subject: [PATCH 2/2] fix: merge conflict

---
 erpnext/accounts/doctype/payment_request/payment_request.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py
index af9a58a08f2..172be1712b8 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/payment_request.py
@@ -664,9 +664,7 @@ class PaymentRequest(Document):
 def make_payment_request(*args, **kwargs):
 	"""Make payment request"""
 
-	args = frappe._dict(args)
-	if args.dt not in ALLOWED_DOCTYPES_FOR_PAYMENT_REQUEST:
-		frappe.throw(_("Payment Requests cannot be created against: {0}").format(frappe.bold(_(args.dt))))
+	args = frappe._dict(kwargs)
 
 	ref_doc = args.ref_doc or frappe.get_doc(args.dt, args.dn)
 
-- 
GitLab