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

fix(india): minor e-invoicing fixes (backport #30553) (#31067)

Browse Source
This commit is contained in:
mergify[bot]
2022-05-19 14:26:38 +05:30
committed by GitHub
parent 836bfc603a
commit 432210d13d
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/print_format/gst_e_invoice/gst_e_invoice.html
View File

@@ -1,7 +1,8 @@
{%- from "templates/print_formats/standard_macros.html" import add_header, render_field, print_value -%} {%- from "templates/print_formats/standard_macros.html" import add_header, render_field, print_value -%}
{%- set einvoice = json.loads(doc.signed_einvoice) -%}
<div class="page-break"> <div class="page-break">
{% if doc.signed_einvoice %}
{%- set einvoice = json.loads(doc.signed_einvoice) -%}
<div {% if print_settings.repeat_header_footer %} id="header-html" class="hidden-pdf" {% endif %}> <div {% if print_settings.repeat_header_footer %} id="header-html" class="hidden-pdf" {% endif %}>
{% if letter_head and not no_letterhead %} {% if letter_head and not no_letterhead %}
<div class="letter-head">{{ letter_head }}</div> <div class="letter-head">{{ letter_head }}</div>
@@ -163,4 +164,10 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div> {% else %}
<div class="text-center" style="color: #98A1A9; font-size: 14px;">
You must generate IRN before you can preview GST E-Invoice.
</div>
{% endif %}
</div>

2
erpnext/regional/india/e_invoice/utils.py
View File

@@ -306,7 +306,7 @@ def update_other_charges(tax_row, invoice_value_details, gst_accounts_list, invo
def get_payment_details(invoice): def get_payment_details(invoice):
payee_name = invoice.company payee_name = invoice.company
mode_of_payment = ', '.join([d.mode_of_payment for d in invoice.payments]) mode_of_payment = ""
paid_amount = invoice.base_paid_amount paid_amount = invoice.base_paid_amount
outstanding_amount = invoice.outstanding_amount outstanding_amount = invoice.outstanding_amount