fix: Wrap unexpectedly long text in remark
(cherry picked from commit ba66a6714c495f9d70dad79344342779c8011c6e)
# Conflicts:
# erpnext/accounts/report/general_ledger/general_ledger.html
(cherry picked from commit b13bf1ebc517ccd9c5b6b079208ca3883e7418fd)
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.html b/erpnext/accounts/report/general_ledger/general_ledger.html
index 475be92..e91c05d 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.html
+++ b/erpnext/accounts/report/general_ledger/general_ledger.html
@@ -38,8 +38,11 @@
{% if(data[i].posting_date) { %}
<td>{%= frappe.datetime.str_to_user(data[i].posting_date) %}</td>
<td>{%= data[i].voucher_type %}
- <br>{%= data[i].voucher_no %}</td>
- <td>
+ <br>{%= data[i].voucher_no %}
+ </td>
+ {% var longest_word = cstr(data[i].remarks).split(" ").reduce((longest, word) => word.length > longest.length ? word : longest, ""); %}
+ <td {% if longest_word.length > 45 %} class="overflow-wrap-anywhere" {% endif %}>
+ <span>
{% if(!(filters.party || filters.account)) { %}
{%= data[i].party || data[i].account %}
<br>
@@ -49,11 +52,22 @@
{% if(data[i].bill_no) { %}
<br>{%= __("Supplier Invoice No") %}: {%= data[i].bill_no %}
{% } %}
+<<<<<<< HEAD
</td>
<td style="text-align: right">
{%= format_currency(data[i].debit, filters.presentation_currency || data[i].account_currency) %}</td>
<td style="text-align: right">
{%= format_currency(data[i].credit, filters.presentation_currency || data[i].account_currency) %}</td>
+=======
+ </span>
+ </td>
+ <td style="text-align: right">
+ {%= format_currency(data[i].debit, filters.presentation_currency) %}
+ </td>
+ <td style="text-align: right">
+ {%= format_currency(data[i].credit, filters.presentation_currency) %}
+ </td>
+>>>>>>> ba66a6714c (fix: Wrap unexpectedly long text in remark)
{% } else { %}
<td></td>
<td></td>