nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 06:59:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
barredterra
2024-08-17 02:24:58 +02:00
parent 4914481105
commit dbd466b6b2
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/controllers/accounts_controller.py
View File

@@ -233,13 +233,8 @@ class AccountsController(TransactionBase):
).format( ).format(
frappe.bold(document_type), frappe.bold(document_type),
get_link_to_form(self.doctype, self.get("return_against")), get_link_to_form(self.doctype, self.get("return_against")),
<<<<<<< HEAD
frappe.bold("Update Outstanding for Self"),
get_link_to_form("Payment Reconciliation", "Payment Reconciliation"),
=======
frappe.bold(_("Update Outstanding for Self")), frappe.bold(_("Update Outstanding for Self")),
get_link_to_form("Payment Reconciliation"), get_link_to_form("Payment Reconciliation", "Payment Reconciliation"),
>>>>>>> af0ae930ca (fix: translatability of boldened text)
) )
) )