Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Resolve conflicts

Browse Source 
(cherry picked from commit f6469d83981386a7bb57b41178055eae5cda30bf)
This commit is contained in:
Suraj Shetty 2023-03-01 16:25:25 +05:30 committed by Mergify
parent 46a722d51c
commit 6cd2ba5c66
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/report/general_ledger/general_ledger.html
View File

@ -52,13 +52,6 @@
{% if(data[i].bill_no) { %} {% if(data[i].bill_no) { %}
<br>{%= __("Supplier Invoice No") %}: {%= 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> </span>
</td> </td>
<td style="text-align: right"> <td style="text-align: right">
@ -67,7 +60,6 @@
<td style="text-align: right"> <td style="text-align: right">
{%= format_currency(data[i].credit, filters.presentation_currency) %} {%= format_currency(data[i].credit, filters.presentation_currency) %}
</td> </td>
>>>>>>> ba66a6714c (fix: Wrap unexpectedly long text in remark)
{% } else { %} {% } else { %}
<td></td> <td></td>
<td></td> <td></td>