diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index 32020b88772754c4d427f05d0c30dd146742b2cd..172be1712b8d0cd1b5c0b352fd6baa9b0401b22d 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -663,7 +663,9 @@ class PaymentRequest(Document): @frappe.whitelist(allow_guest=True) def make_payment_request(*args, **kwargs): """Make payment request""" + args = frappe._dict(kwargs) + 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 ba1d7551e620d688a4aff304ae4ae65841d97074..bbe88bf18a72f32b695eb4844206dcfe69c723ea 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 62d90693ff669a0e6a700d3057474dc47222c32e..6e99549264ccb8285cbe9f8fe696b801752e52b1 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), + # )