diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py index 22485e95f74..6f1c2c973d0 100644 --- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py @@ -1116,7 +1116,7 @@ class TestSalesInvoice(unittest.TestCase): }) si.insert() - tax_breakup_html = '''\n
\n\t\n\t\t\n\n\n\t\t\n\t
Item NameTaxable Amount_Test Account Service Tax - _TC
_Test Item\u20b9 5,000.00(10.0%) \u20b9 500.00
\n
''' + tax_breakup_html = '''\n
\n\t\n\t\t\n\t\t\n\t
Item NameTaxable Amount_Test Account Service Tax - _TC
_Test Item\u20b9 5,000.00(10.0%) \u20b9 500.00
\n
''' self.assertEqual(si.other_charges_calculation, tax_breakup_html) diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py index 8c071203e86..8eb83af6d57 100644 --- a/erpnext/controllers/taxes_and_totals.py +++ b/erpnext/controllers/taxes_and_totals.py @@ -531,8 +531,8 @@ class calculate_taxes_and_totals(object): {rows} '''.format(**{ - "headings": "\n".join(headings), - "rows": "\n".join(rows) + "headings": "".join(headings), + "rows": "".join(rows) }) def get_item_tax(self, item_tax, tax_accounts, company_currency): @@ -605,7 +605,7 @@ def get_table_rows(distinct_items, item_tax, tax_accounts, company_currency): rows.append("{item_name}{taxable_amount}{taxes}".format(**{ "item_name": item.item_name, "taxable_amount": fmt_money(item.net_amount, item.precision("net_amount"), company_currency), - "taxes": "\n".join(taxes) + "taxes": "".join(taxes) })) return rows \ No newline at end of file diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js index 075b2d0bdfe..e917a75d6d7 100644 --- a/erpnext/public/js/controllers/taxes_and_totals.js +++ b/erpnext/public/js/controllers/taxes_and_totals.js @@ -689,7 +689,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({ return '' + (head || "") + ""; } } - ).join("\n"); + ).join(""); var distinct_item_names = []; var distinct_items = []; @@ -711,9 +711,9 @@ erpnext.taxes_and_totals = erpnext.payments.extend({ return item_tax_record[head[0]] ? "(" + item_tax_record[head[0]][0] + ") " + item_tax_record[head[0]][1] + "" : ""; - }).join("\n") + }).join("") }); - }).join("\n"); + }).join(""); if(!rows) return ""; return '
\