From e85238383f714e0e5a75341b51768fbfce110258 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Tue, 9 Sep 2025 12:55:55 +0530 Subject: [PATCH 01/45] feat: default print format for sales invoice --- .../sales_invoice_print_format/__init__.py | 0 .../sales_invoice_print_format.html | 148 ++++++++++++++++++ .../sales_invoice_print_format.json | 32 ++++ 3 files changed, 180 insertions(+) create mode 100644 erpnext/accounts/print_format/sales_invoice_print_format/__init__.py create mode 100644 erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html create mode 100644 erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.json diff --git a/erpnext/accounts/print_format/sales_invoice_print_format/__init__.py b/erpnext/accounts/print_format/sales_invoice_print_format/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html new file mode 100644 index 00000000000..c5800c0645f --- /dev/null +++ b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html @@ -0,0 +1,148 @@ +{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, +print_heading_template=None) -%} {% if letter_head and not no_letterhead %} +
{{ letter_head }}
+{% endif %} {% if print_heading_template %} {{ frappe.render_template(print_heading_template, {"doc":doc}) }} +{% else %} {% endif %} {%- if doc.meta.is_submittable and doc.docstatus==2-%} +
+

{{ _("CANCELLED") }}

+
+{%- endif -%} {%- endmacro -%} {% for page in layout %} +
+
+ {{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }} +
+ + + + + + + + + + + + {% set address = (doc.address_display) %} {% if address.rstrip().endswith("
") %} {% set + address = address[:-5] %} {% endif %} {% set company_address_display = + (doc.company_address_display) %} {% if company_address_display.rstrip().endswith("
") %} {% + set company_address_display = company_address_display[:-5] %} {% endif %} + + + +
+ {{ _("Customer Name") }}: {{doc.customer_name }} + + {{ _("Payment Due Date") }}: {{ + frappe.utils.format_date(doc.due_date) }} +
{{ _("Invoice Number") }}: {{ doc.name }} + {{ _("Invoice Date") }}: {{ + frappe.utils.format_date(doc.posting_date) }} +
{{ _("Bill From") }}:
{{ address }}		{{ _("Bill To") }}:
{{ company_address_display }}
+ + + + + + + + + + + + + + + + + + + + + {% for item in doc.items %} + + + + + + + + {% endfor %} + +
{{ _("No") }}{{ _("Item") }}{{ _("Quantity") }}{{ _("Rate") }}{{ _("Amount") }}
{{ loop.index }}{{ item.item_name }}{{ item.get_formatted("qty", 0) }} {{ item.uom }}{{ item.get_formatted("net_rate", doc) }}{{ item.get_formatted("net_amount", doc) }}
+ + +
+
+
+

{{ _("Total in words") }}

+
{{ doc.in_words }}
+
+
+
+ + + + + + + + + + {% set tax_rate = doc.taxes | selectattr("tax_amount") | sum(attribute="rate") %} {% if + tax_rate > 0 %} + + + + + {% endif %} + + + + +
{{ _("Sub Total:") }}{{ doc.get_formatted("total", doc) }}
+ {{ _("Discount") }} ({{ doc.additional_discount_percentage }}%): + {{ doc.get_formatted("discount_amount", doc) }}
{{ _("Tax") }} ({{ tax_rate }}%):{{ doc.get_formatted("total_taxes_and_charges", doc) }}
{{ _("Grand Total:") }}{{ doc.get_formatted("grand_total", doc) }}
+
+
+ + + {% if doc.taxes_and_charges %} +
{{ _("Tax Breakup") }}
+
+ + + + + + {% for row in doc.taxes %} + + {% endfor %} + + + + {% for item in doc.items %} + + + + {% for row in doc.taxes %} {% set tax_amount = item.base_net_amount * (row.rate / 100) %} + + {% endfor %} + + {% endfor %} + +
{{ _("HSN/SAC") }}{{ _("Taxable Amount") }}{{ row.description }}
{{ item.gst_hsn_code }}{{ item.get_formatted("base_net_amount", doc) }} + ({{ (row.rate) }}%) {{ frappe.format_value(tax_amount, {"fieldtype": "Currency"}, doc) + }} +
+
+ {% endif %} + + + {% if doc.terms %} +
+
{{ _("Terms and Conditions") }}
+ {{ doc.terms}} +
+ {% endif %} +
+{% endfor %} diff --git a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.json b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.json new file mode 100644 index 00000000000..34198f03e9c --- /dev/null +++ b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.json @@ -0,0 +1,32 @@ +{ + "absolute_value": 0, + "align_labels_right": 0, + "creation": "2025-08-28 04:03:36.284420", + "custom_format": 0, + "default_print_language": "en", + "disabled": 0, + "doc_type": "Sales Invoice", + "docstatus": 0, + "doctype": "Print Format", + "font_size": 14, + "idx": 0, + "line_breaks": 0, + "margin_bottom": 15.0, + "margin_left": 15.0, + "margin_right": 15.0, + "margin_top": 15.0, + "modified": "2025-09-01 17:47:14.710435", + "modified_by": "Administrator", + "module": "Accounts", + "name": "Sales Invoice Print Format", + "owner": "Administrator", + "page_number": "Hide", + "pdf_generator": "wkhtmltopdf", + "print_format_builder": 0, + "print_format_builder_beta": 0, + "print_format_for": "DocType", + "print_format_type": "Jinja", + "raw_printing": 0, + "show_section_headings": 0, + "standard": "Yes" +} From af974fbccdf3ce8e473e59cbed924ada5e72107a Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Tue, 9 Sep 2025 12:56:51 +0530 Subject: [PATCH 02/45] feat: add css --- .../sales_invoice_print_format.html | 141 ++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html index c5800c0645f..c9fbea3698b 100644 --- a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html +++ b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html @@ -12,6 +12,147 @@ print_heading_template=None) -%} {% if letter_head and not no_letterhead %} {{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }} + +
From 156dda8157dabf4b68dedd1fa29f0576863fd345 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Tue, 9 Sep 2025 13:25:14 +0530 Subject: [PATCH 03/45] style: change padding --- .../sales_invoice_print_format/sales_invoice_print_format.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html index c9fbea3698b..65bfd93c2be 100644 --- a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html +++ b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html @@ -16,7 +16,7 @@ print_heading_template=None) -%} {% if letter_head and not no_letterhead %} .invoice-wrapper { font-family: "Inter", sans-serif; color: var(--black-overlay-700); - padding: 24px; + padding: 12px; } table.info-table, From 7386270fce5cb93e096c0a25ddac378c9c56236d Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Tue, 9 Sep 2025 14:45:37 +0530 Subject: [PATCH 04/45] feat: add letterhead fixture --- erpnext/fixtures/letter_head.json | 48 +++++++++++++++++++++++++++++++ erpnext/hooks.py | 2 ++ 2 files changed, 50 insertions(+) create mode 100644 erpnext/fixtures/letter_head.json diff --git a/erpnext/fixtures/letter_head.json b/erpnext/fixtures/letter_head.json new file mode 100644 index 00000000000..4b9e7d9cc46 --- /dev/null +++ b/erpnext/fixtures/letter_head.json @@ -0,0 +1,48 @@ +[ + { + "align": "Left", + "content": "\n\n
\n
\n
\n {% if frappe.db.get_value(\"Company\", doc.company, \"logo_for_printing\") %}\n \n {% endif %}\n
\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n {% set pan = frappe.db.get_value(\"Company\", doc.company, \"pan\") %}\n\n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n {% if pan %}\n
\n
{{ _(\"PAN:\") }}
\n
{{ pan }}

\n
\n {% endif %}\n
\n
\n", + "disabled": 0, + "docstatus": 0, + "doctype": "Letter Head", + "footer": null, + "footer_align": "Left", + "footer_image": null, + "footer_image_height": 0.0, + "footer_image_width": 0.0, + "footer_script": null, + "footer_source": "HTML", + "header_script": null, + "image": null, + "image_height": 0.0, + "image_width": 0.0, + "is_default": 0, + "letter_head_name": "Sales Invoice Letter Head", + "modified": "2025-09-09 14:31:07.209406", + "name": "Sales Invoice Letter Head", + "source": "HTML" + }, + { + "align": "Left", + "content": "\n\n
\n
\n
\n {% if frappe.db.get_value(\"Company\", doc.company, \"logo_for_printing\") %}\n \n {% endif %}\n
\n
\n
\n {{ _(\"Sales Invoice\") }}\n
\n
\n {{ doc.name }}\n
\n
\n
\n
\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n {% set pan = frappe.db.get_value(\"Company\", doc.company, \"pan\") %}\n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n {% if pan %}\n
\n
{{ _(\"PAN:\") }}
\n
{{ pan }}

\n
\n {% endif %}\n
\n
\n
\n", + "disabled": 0, + "docstatus": 0, + "doctype": "Letter Head", + "footer": null, + "footer_align": "Left", + "footer_image": null, + "footer_image_height": 0.0, + "footer_image_width": 0.0, + "footer_script": null, + "footer_source": "HTML", + "header_script": null, + "image": null, + "image_height": 0.0, + "image_width": 0.0, + "is_default": 1, + "letter_head_name": "Print Format Letter Head", + "modified": "2025-09-09 14:31:07.204974", + "name": "Print Format Letter Head", + "source": "HTML" + } +] \ No newline at end of file diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 22bff524dea..540fd6c36c4 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -600,6 +600,8 @@ user_privacy_documents = [ }, ] +fixtures = ["Letter Head"] + # ERPNext doctypes for Global Search global_search_doctypes = { "Default": [ From 1adbf90d8c51c44035b48d23f55ab8109eb43deb Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Tue, 9 Sep 2025 18:58:45 +0530 Subject: [PATCH 05/45] fix: css changes in letterhead --- .../sales_invoice_print_format.html | 4 ++-- erpnext/fixtures/letter_head.json | 8 ++++---- erpnext/hooks.py | 8 +++++++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html index 65bfd93c2be..6a9b5f24564 100644 --- a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html +++ b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html @@ -148,12 +148,12 @@ print_heading_template=None) -%} {% if letter_head and not no_letterhead %} font-style: normal; font-weight: 420; line-height: 21px; - padding: 12px; + padding: 5px; letter-spacing: 0.14px; } - +
- {% set address = (doc.address_display) %} {% if address.rstrip().endswith("
") %} {% set + {% set address = (doc.address_display) %} {% if address and address.rstrip().endswith("
") %} {% set address = address[:-5] %} {% endif %} {% set company_address_display = - (doc.company_address_display) %} {% if company_address_display.rstrip().endswith("
") %} {% + (doc.company_address_display) %} {% if company_address_display and company_address_display.rstrip().endswith("
") %} {% set company_address_display = company_address_display[:-5] %} {% endif %} From c78079628462ab9520e9e631c7e6ec1b9e653589 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Mon, 15 Sep 2025 16:27:12 +0530 Subject: [PATCH 09/45] fix: remove border if company logo not available --- erpnext/fixtures/letter_head.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/erpnext/fixtures/letter_head.json b/erpnext/fixtures/letter_head.json index 36314aa4317..1b0eb0962c8 100644 --- a/erpnext/fixtures/letter_head.json +++ b/erpnext/fixtures/letter_head.json @@ -1,7 +1,7 @@ [ { "align": "Left", - "content": "\n\n
\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n \n {% endif %}\n
\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n
\n \n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n
\n
\n
{{ _(\"Invoice:\") }}
\n
{{ doc.name }}

\n
\n
\n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n
\n
\n", + "content": "\n\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n
\n \n
\n {% endif %}\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n
\n \n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n
\n
\n
{{ _(\"Invoice:\") }}
\n
{{ doc.name }}

\n
\n
\n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n
\n
\n", "disabled": 0, "docstatus": 0, "doctype": "Letter Head", @@ -16,15 +16,15 @@ "image": null, "image_height": 0.0, "image_width": 0.0, - "is_default": 1, + "is_default": 0, "letter_head_name": "Sales Invoice Letter Head", - "modified": "2025-09-10 14:21:04.051369", + "modified": "2025-09-15 16:23:58.583661", "name": "Sales Invoice Letter Head", "source": "HTML" }, { "align": "Left", - "content": "\n\n
\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n \n {% endif %}\n
\n
\n
\n {{ _(\"Sales Invoice\") }}\n
\n
\n {{ doc.name }}\n
\n
\n
\n
\n
\n
{{ doc.company }}
\n \n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n \n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n \n
\n
\n
\n", + "content": "\n\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n
\n \n
\n {% endif %}\n
\n
{{ doc.company }}
\n \n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n \n
\n
\n
\n \n
\n
\n {{ _(\"Sales Invoice\") }}\n
\n
\n {{ doc.name }}\n
\n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n \n
\n
\n
\n", "disabled": 0, "docstatus": 0, "doctype": "Letter Head", @@ -41,7 +41,7 @@ "image_width": 0.0, "is_default": 0, "letter_head_name": "Print Format Letter Head", - "modified": "2025-09-10 14:21:04.063016", + "modified": "2025-09-15 16:14:24.080812", "name": "Print Format Letter Head", "source": "HTML" } From 4cc2afbd832aab3dfc3ac5dc668934411d79daad Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Mon, 15 Sep 2025 16:34:14 +0530 Subject: [PATCH 10/45] feat: print format design two --- .../print_format_sales_invoice/__init__.py | 0 .../print_format_sales_invoice.html | 310 ++++++++++++++++++ .../print_format_sales_invoice.json | 32 ++ 3 files changed, 342 insertions(+) create mode 100644 erpnext/accounts/print_format/print_format_sales_invoice/__init__.py create mode 100644 erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html create mode 100644 erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.json diff --git a/erpnext/accounts/print_format/print_format_sales_invoice/__init__.py b/erpnext/accounts/print_format/print_format_sales_invoice/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html new file mode 100644 index 00000000000..aa1f9923326 --- /dev/null +++ b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html @@ -0,0 +1,310 @@ +{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, +print_heading_template=None) -%} {% if letter_head and not no_letterhead %} +
{{ letter_head }}
+{% endif %} {% if print_heading_template %} {{ frappe.render_template(print_heading_template, {"doc":doc}) }} +{% endif %} {%- if doc.meta.is_submittable and doc.docstatus==2 -%} +
+

{{ _("CANCELLED") }}

+
+{%- endif -%} {%- endmacro -%} {% for page in layout %} +
+
+ {{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }} +
+ + + +
{{ _("Customer Name") }}: {{doc.customer_name }} diff --git a/erpnext/fixtures/letter_head.json b/erpnext/fixtures/letter_head.json index 4b9e7d9cc46..b956a8c64e3 100644 --- a/erpnext/fixtures/letter_head.json +++ b/erpnext/fixtures/letter_head.json @@ -1,7 +1,7 @@ [ { "align": "Left", - "content": "\n\n
\n
\n
\n {% if frappe.db.get_value(\"Company\", doc.company, \"logo_for_printing\") %}\n \n {% endif %}\n
\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n {% set pan = frappe.db.get_value(\"Company\", doc.company, \"pan\") %}\n\n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n {% if pan %}\n
\n
{{ _(\"PAN:\") }}
\n
{{ pan }}

\n
\n {% endif %}\n
\n
\n", + "content": "\n\n
\n
\n
\n {% if frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n \n {% endif %}\n
\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n {% set pan = frappe.db.get_value(\"Company\", doc.company, \"pan\") %}\n\n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n {% if pan %}\n
\n
{{ _(\"PAN:\") }}
\n
{{ pan }}

\n
\n {% endif %}\n
\n
\n", "disabled": 0, "docstatus": 0, "doctype": "Letter Head", @@ -18,13 +18,13 @@ "image_width": 0.0, "is_default": 0, "letter_head_name": "Sales Invoice Letter Head", - "modified": "2025-09-09 14:31:07.209406", + "modified": "2025-09-09 18:25:09.704061", "name": "Sales Invoice Letter Head", "source": "HTML" }, { "align": "Left", - "content": "\n\n
\n
\n
\n {% if frappe.db.get_value(\"Company\", doc.company, \"logo_for_printing\") %}\n \n {% endif %}\n
\n
\n
\n {{ _(\"Sales Invoice\") }}\n
\n
\n {{ doc.name }}\n
\n
\n
\n
\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n {% set pan = frappe.db.get_value(\"Company\", doc.company, \"pan\") %}\n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n {% if pan %}\n
\n
{{ _(\"PAN:\") }}
\n
{{ pan }}

\n
\n {% endif %}\n
\n
\n
\n", + "content": "\n\n
\n
\n
\n {% if frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n \n {% endif %}\n
\n
\n
\n {{ _(\"Sales Invoice\") }}\n
\n
\n {{ doc.name }}\n
\n
\n
\n
\n
\n
{{ doc.company }}
\n \n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n \n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n {% set pan = frappe.db.get_value(\"Company\", doc.company, \"pan\") %}\n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n {% if pan %}\n
\n
{{ _(\"PAN:\") }}
\n
{{ pan }}

\n
\n {% endif %}\n
\n
\n
\n", "disabled": 0, "docstatus": 0, "doctype": "Letter Head", @@ -41,7 +41,7 @@ "image_width": 0.0, "is_default": 1, "letter_head_name": "Print Format Letter Head", - "modified": "2025-09-09 14:31:07.204974", + "modified": "2025-09-09 18:11:28.309162", "name": "Print Format Letter Head", "source": "HTML" } diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 540fd6c36c4..213efd9a0f6 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -600,7 +600,13 @@ user_privacy_documents = [ }, ] -fixtures = ["Letter Head"] +fixtures = [ + { + "dt": "Letter Head", + "filters": [["name", "in", ["Sales Invoice Letter Head", "Print Format Letter Head"]]], + } +] + # ERPNext doctypes for Global Search global_search_doctypes = { From 2bc19783cb61abb2e56c9ad134667b5d77fe36e2 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Wed, 10 Sep 2025 13:24:30 +0530 Subject: [PATCH 06/45] fix: letterhead styling --- erpnext/fixtures/letter_head.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/fixtures/letter_head.json b/erpnext/fixtures/letter_head.json index b956a8c64e3..32d56e77475 100644 --- a/erpnext/fixtures/letter_head.json +++ b/erpnext/fixtures/letter_head.json @@ -1,7 +1,7 @@ [ { "align": "Left", - "content": "\n\n
\n
\n
\n {% if frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n \n {% endif %}\n
\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n {% set pan = frappe.db.get_value(\"Company\", doc.company, \"pan\") %}\n\n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n {% if pan %}\n
\n
{{ _(\"PAN:\") }}
\n
{{ pan }}

\n
\n {% endif %}\n
\n
\n", + "content": "\n\n
\n
\n
\n {% if frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n \n {% endif %}\n
\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n
\n \n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n
\n
\n
{{ _(\"Invoice:\") }}
\n
{{ doc.name }}

\n
\n
\n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n
\n
\n", "disabled": 0, "docstatus": 0, "doctype": "Letter Head", @@ -18,13 +18,13 @@ "image_width": 0.0, "is_default": 0, "letter_head_name": "Sales Invoice Letter Head", - "modified": "2025-09-09 18:25:09.704061", + "modified": "2025-09-10 00:56:32.108422", "name": "Sales Invoice Letter Head", "source": "HTML" }, { "align": "Left", - "content": "\n\n
\n
\n
\n {% if frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n \n {% endif %}\n
\n
\n
\n {{ _(\"Sales Invoice\") }}\n
\n
\n {{ doc.name }}\n
\n
\n
\n
\n
\n
{{ doc.company }}
\n \n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n \n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n {% set pan = frappe.db.get_value(\"Company\", doc.company, \"pan\") %}\n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n {% if pan %}\n
\n
{{ _(\"PAN:\") }}
\n
{{ pan }}

\n
\n {% endif %}\n
\n
\n
\n", + "content": "\n\n
\n
\n
\n {% if frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n \n {% endif %}\n
\n
\n
\n {{ _(\"Sales Invoice\") }}\n
\n
\n {{ doc.name }}\n
\n
\n
\n
\n
\n
{{ doc.company }}
\n \n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n \n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n \n
\n
\n
\n", "disabled": 0, "docstatus": 0, "doctype": "Letter Head", @@ -41,7 +41,7 @@ "image_width": 0.0, "is_default": 1, "letter_head_name": "Print Format Letter Head", - "modified": "2025-09-09 18:11:28.309162", + "modified": "2025-09-10 00:56:32.101771", "name": "Print Format Letter Head", "source": "HTML" } From b5c739d1cc0d58fa654df19dede4fe7d3b18fc89 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Wed, 10 Sep 2025 14:21:50 +0530 Subject: [PATCH 07/45] fix: broken img tag in letterhead --- erpnext/fixtures/letter_head.json | 50 +++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/erpnext/fixtures/letter_head.json b/erpnext/fixtures/letter_head.json index 32d56e77475..36314aa4317 100644 --- a/erpnext/fixtures/letter_head.json +++ b/erpnext/fixtures/letter_head.json @@ -1,30 +1,7 @@ [ { "align": "Left", - "content": "\n\n
\n
\n
\n {% if frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n \n {% endif %}\n
\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n
\n \n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n
\n
\n
{{ _(\"Invoice:\") }}
\n
{{ doc.name }}

\n
\n
\n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n
\n
\n", - "disabled": 0, - "docstatus": 0, - "doctype": "Letter Head", - "footer": null, - "footer_align": "Left", - "footer_image": null, - "footer_image_height": 0.0, - "footer_image_width": 0.0, - "footer_script": null, - "footer_source": "HTML", - "header_script": null, - "image": null, - "image_height": 0.0, - "image_width": 0.0, - "is_default": 0, - "letter_head_name": "Sales Invoice Letter Head", - "modified": "2025-09-10 00:56:32.108422", - "name": "Sales Invoice Letter Head", - "source": "HTML" - }, - { - "align": "Left", - "content": "\n\n
\n
\n
\n {% if frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n \n {% endif %}\n
\n
\n
\n {{ _(\"Sales Invoice\") }}\n
\n
\n {{ doc.name }}\n
\n
\n
\n
\n
\n
{{ doc.company }}
\n \n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n \n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n \n
\n
\n
\n", + "content": "\n\n
\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n \n {% endif %}\n
\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n
\n \n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n
\n
\n
{{ _(\"Invoice:\") }}
\n
{{ doc.name }}

\n
\n
\n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n
\n
\n", "disabled": 0, "docstatus": 0, "doctype": "Letter Head", @@ -40,8 +17,31 @@ "image_height": 0.0, "image_width": 0.0, "is_default": 1, + "letter_head_name": "Sales Invoice Letter Head", + "modified": "2025-09-10 14:21:04.051369", + "name": "Sales Invoice Letter Head", + "source": "HTML" + }, + { + "align": "Left", + "content": "\n\n
\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n \n {% endif %}\n
\n
\n
\n {{ _(\"Sales Invoice\") }}\n
\n
\n {{ doc.name }}\n
\n
\n
\n
\n
\n
{{ doc.company }}
\n \n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n \n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n \n
\n
\n
\n", + "disabled": 0, + "docstatus": 0, + "doctype": "Letter Head", + "footer": null, + "footer_align": "Left", + "footer_image": null, + "footer_image_height": 0.0, + "footer_image_width": 0.0, + "footer_script": null, + "footer_source": "HTML", + "header_script": null, + "image": null, + "image_height": 0.0, + "image_width": 0.0, + "is_default": 0, "letter_head_name": "Print Format Letter Head", - "modified": "2025-09-10 00:56:32.101771", + "modified": "2025-09-10 14:21:04.063016", "name": "Print Format Letter Head", "source": "HTML" } From ddf4a83cf86edc74f167fe24b463e54237b75ba7 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Mon, 15 Sep 2025 16:22:39 +0530 Subject: [PATCH 08/45] fix: condition based address display --- .../sales_invoice_print_format.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html index 6a9b5f24564..a97d5f67790 100644 --- a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html +++ b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html @@ -171,9 +171,9 @@ print_heading_template=None) -%} {% if letter_head and not no_letterhead %}
{{ _("Bill From") }}:
{{ address }}		 {{ _("Bill To") }}:
{{ company_address_display }}
+ + + + + +
+
+
Customer Name:
+
Bill to:
+
+
+
{{ doc.customer_name }}
+
{{ doc.address_display or "" }}
+
+ 		+
+
Invoice Number:
+
Invoice Date:
+
Payment Due Date:
+
+
+
{{ doc.name }}
+
{{ frappe.utils.format_date(doc.posting_date) }}
+
{{ frappe.utils.format_date(doc.due_date) }}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + {% for item in doc.items %} + + + + + + + + + + {% endfor %} + +
{{ _("No") }}{{ _("Item") }}{{ _("HSN/SAC") }}{{ _("Quantity") }}{{ _("Rate") }}{{ _("Amount") }}
{{ loop.index }} +
+
+ {% if item.image %} +
+ {{ item.item_name }} +
+ {% endif %} +
+
{{ item.item_name }}
+
+ 		{{ item.gst_hsn_code }}{{ item.get_formatted("qty", 0) }} {{ item.uom }}{{ item.get_formatted("net_rate", doc) }}{{ item.get_formatted("net_amount", doc) }}
+ + + + + + + + + + + +
  + + + + + + + + + + {% set tax_rate = doc.taxes | selectattr("tax_amount") | sum(attribute="rate") %} {% if + tax_rate > 0 %} + + + + + {% endif %} +
{{ _("Sub Total:") }}{{ doc.get_formatted("total", doc) }}
+ {{ _("Discount") }} ({{ doc.additional_discount_percentage or 0 }}%): + {{ doc.get_formatted("discount_amount", doc) }}
{{ _("Tax") }} ({{ tax_rate }}%):{{ doc.get_formatted("total_taxes_and_charges", doc) }}
+
+
+ + + + + + +
+
{{ _("In Words: ") }}{{ doc.in_words }}
+ 		{{ _("Grand Total:") }} + + {{ doc.get_formatted("grand_total", doc) }} + +
+
+
+ + {% if doc.taxes_and_charges %} + +
{{ _("Tax Breakup") }}
+ + + + + {% for row in doc.taxes %} + + {% endfor %} + + + + {% for item in doc.items %} + + + + {% for row in doc.taxes %} {% set tax_amount = item.base_net_amount * (row.rate / 100) %} + + {% endfor %} + + {% endfor %} + +
{{ _("HSN/SAC") }}{{ _("Taxable Amount") }}{{ row.description }} ({{ row.rate }}%)
{{ item.gst_hsn_code }}{{ item.get_formatted("base_net_amount", doc) }} + {{ frappe.format_value(tax_amount, {"fieldtype": "Currency"}, doc) }} +
+ {% endif %} + + + {% if doc.terms %} +
+
{{ _("Terms and Conditions") }}
+ {{ doc.terms}} +
+ {% endif %} + +{% endfor %} diff --git a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.json b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.json new file mode 100644 index 00000000000..9952485cc28 --- /dev/null +++ b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.json @@ -0,0 +1,32 @@ +{ + "absolute_value": 0, + "align_labels_right": 0, + "creation": "2025-09-15 16:31:00.732539", + "custom_format": 0, + "default_print_language": "en", + "disabled": 0, + "doc_type": "Sales Invoice", + "docstatus": 0, + "doctype": "Print Format", + "font_size": 14, + "idx": 0, + "line_breaks": 0, + "margin_bottom": 15.0, + "margin_left": 15.0, + "margin_right": 15.0, + "margin_top": 15.0, + "modified": "2025-09-15 16:31:00.732539", + "modified_by": "Administrator", + "module": "Accounts", + "name": "Print Format Sales Invoice", + "owner": "Administrator", + "page_number": "Hide", + "pdf_generator": "wkhtmltopdf", + "print_format_builder": 0, + "print_format_builder_beta": 0, + "print_format_for": "DocType", + "print_format_type": "Jinja", + "raw_printing": 0, + "show_section_headings": 0, + "standard": "Yes" +} From e08f82909c371d6a50e18c73218525a010000a0a Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Mon, 15 Sep 2025 16:39:33 +0530 Subject: [PATCH 11/45] fix: radius of the items/tax table thead --- .../print_format_sales_invoice/print_format_sales_invoice.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html index aa1f9923326..233083b1f34 100644 --- a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html +++ b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html @@ -86,10 +86,12 @@ print_heading_template=None) -%} {% if letter_head and not no_letterhead %} .items-table tr:first-child td:first-child, .tax-table tr:first-child td:first-child { border-top-left-radius: 10px; + border-bottom-left-radius: 10px; } .items-table tr:first-child td:last-child, .tax-table tr:first-child td:last-child { border-top-right-radius: 10px; + border-bottom-right-radius: 10px; } .in-words { From 6b83309750eec9d51a506a4ebb9094ef08b7aba8 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Tue, 16 Sep 2025 22:45:05 +0530 Subject: [PATCH 12/45] test: just debugging --- .../test_process_statement_of_accounts.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py b/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py index 4f9dd9a590d..5bf0c0b4464 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py +++ b/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py @@ -81,7 +81,8 @@ class TestProcessStatementOfAccounts(AccountsTestMixin, IntegrationTestCase): process_soa = create_process_soa( name="_Test Process SOA", enable_auto_email=1, report="Accounts Receivable" ) - send_emails(process_soa.name, from_scheduler=True) + if not frappe.flags.in_migrate: + send_emails(process_soa.name, from_scheduler=True) process_soa.load_from_db() self.assertEqual(process_soa.posting_date, getdate(add_days(today(), 7))) From 17397ae652c6a47f5f8ba489f55b257e001f95bc Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Tue, 16 Sep 2025 23:09:42 +0530 Subject: [PATCH 13/45] test: add in_install condition for debugging --- .../test_process_statement_of_accounts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py b/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py index 5bf0c0b4464..acea3614c5e 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py +++ b/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py @@ -81,7 +81,7 @@ class TestProcessStatementOfAccounts(AccountsTestMixin, IntegrationTestCase): process_soa = create_process_soa( name="_Test Process SOA", enable_auto_email=1, report="Accounts Receivable" ) - if not frappe.flags.in_migrate: + if not frappe.flags.in_migrate and not frappe.flags.in_install: send_emails(process_soa.name, from_scheduler=True) process_soa.load_from_db() self.assertEqual(process_soa.posting_date, getdate(add_days(today(), 7))) From f1a2e1b7258c161b20f56a3e00f7b388c6d473fb Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Tue, 16 Sep 2025 23:45:41 +0530 Subject: [PATCH 14/45] refactor: remove img tag for testing --- erpnext/fixtures/letter_head.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/fixtures/letter_head.json b/erpnext/fixtures/letter_head.json index 1b0eb0962c8..7c77cb5d9fe 100644 --- a/erpnext/fixtures/letter_head.json +++ b/erpnext/fixtures/letter_head.json @@ -1,7 +1,7 @@ [ { "align": "Left", - "content": "\n\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n
\n \n
\n {% endif %}\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n
\n \n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n
\n
\n
{{ _(\"Invoice:\") }}
\n
{{ doc.name }}

\n
\n
\n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n
\n
\n", + "content": "\n\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n
\n
\n {% endif %}\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n
\n \n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n
\n
\n
{{ _(\"Invoice:\") }}
\n
{{ doc.name }}

\n
\n
\n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n
\n
\n", "disabled": 0, "docstatus": 0, "doctype": "Letter Head", @@ -24,7 +24,7 @@ }, { "align": "Left", - "content": "\n\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n
\n \n
\n {% endif %}\n
\n
{{ doc.company }}
\n \n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n \n
\n
\n
\n \n
\n
\n {{ _(\"Sales Invoice\") }}\n
\n
\n {{ doc.name }}\n
\n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n \n
\n
\n
\n", + "content": "\n\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n
\n
\n {% endif %}\n
\n
{{ doc.company }}
\n \n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n \n
\n
\n
\n \n
\n
\n {{ _(\"Sales Invoice\") }}\n
\n
\n {{ doc.name }}\n
\n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n \n
\n
\n
\n", "disabled": 0, "docstatus": 0, "doctype": "Letter Head", From 5f97bec2b32ed0da7403e42dfce8f1c9c6575e70 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Wed, 17 Sep 2025 01:02:51 +0530 Subject: [PATCH 15/45] refactor: revert debugging changes --- .../test_process_statement_of_accounts.py | 4 ++-- erpnext/fixtures/letter_head.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py b/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py index acea3614c5e..7d5cfb90af8 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py +++ b/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py @@ -81,8 +81,8 @@ class TestProcessStatementOfAccounts(AccountsTestMixin, IntegrationTestCase): process_soa = create_process_soa( name="_Test Process SOA", enable_auto_email=1, report="Accounts Receivable" ) - if not frappe.flags.in_migrate and not frappe.flags.in_install: - send_emails(process_soa.name, from_scheduler=True) + + send_emails(process_soa.name, from_scheduler=True) process_soa.load_from_db() self.assertEqual(process_soa.posting_date, getdate(add_days(today(), 7))) diff --git a/erpnext/fixtures/letter_head.json b/erpnext/fixtures/letter_head.json index 7c77cb5d9fe..1b0eb0962c8 100644 --- a/erpnext/fixtures/letter_head.json +++ b/erpnext/fixtures/letter_head.json @@ -1,7 +1,7 @@ [ { "align": "Left", - "content": "\n\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n
\n
\n {% endif %}\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n
\n \n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n
\n
\n
{{ _(\"Invoice:\") }}
\n
{{ doc.name }}

\n
\n
\n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n
\n
\n", + "content": "\n\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n
\n \n
\n {% endif %}\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n
\n \n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n
\n
\n
{{ _(\"Invoice:\") }}
\n
{{ doc.name }}

\n
\n
\n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n
\n
\n", "disabled": 0, "docstatus": 0, "doctype": "Letter Head", @@ -24,7 +24,7 @@ }, { "align": "Left", - "content": "\n\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n
\n
\n {% endif %}\n
\n
{{ doc.company }}
\n \n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n \n
\n
\n
\n \n
\n
\n {{ _(\"Sales Invoice\") }}\n
\n
\n {{ doc.name }}\n
\n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n \n
\n
\n
\n", + "content": "\n\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n
\n \n
\n {% endif %}\n
\n
{{ doc.company }}
\n \n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n \n
\n
\n
\n \n
\n
\n {{ _(\"Sales Invoice\") }}\n
\n
\n {{ doc.name }}\n
\n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n \n
\n
\n
\n", "disabled": 0, "docstatus": 0, "doctype": "Letter Head", From 5c4f7782231bbbf45147cf4999a58c9dbd5ad934 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Wed, 17 Sep 2025 12:35:55 +0530 Subject: [PATCH 16/45] style: center-align logo within its container div --- erpnext/fixtures/letter_head.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/erpnext/fixtures/letter_head.json b/erpnext/fixtures/letter_head.json index 1b0eb0962c8..41ab9ccd47c 100644 --- a/erpnext/fixtures/letter_head.json +++ b/erpnext/fixtures/letter_head.json @@ -1,7 +1,7 @@ [ { "align": "Left", - "content": "\n\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n
\n \n
\n {% endif %}\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n
\n \n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n
\n
\n
{{ _(\"Invoice:\") }}
\n
{{ doc.name }}

\n
\n
\n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n
\n
\n", + "content": "\n\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n
\n \n
\n {% endif %}\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n
\n \n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n
\n
\n
{{ _(\"Invoice:\") }}
\n
{{ doc.name }}

\n
\n
\n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n
\n
\n", "disabled": 0, "docstatus": 0, "doctype": "Letter Head", @@ -16,15 +16,15 @@ "image": null, "image_height": 0.0, "image_width": 0.0, - "is_default": 0, + "is_default": 1, "letter_head_name": "Sales Invoice Letter Head", - "modified": "2025-09-15 16:23:58.583661", + "modified": "2025-09-17 11:58:06.023854", "name": "Sales Invoice Letter Head", "source": "HTML" }, { "align": "Left", - "content": "\n\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n
\n \n
\n {% endif %}\n
\n
{{ doc.company }}
\n \n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n \n
\n
\n
\n \n
\n
\n {{ _(\"Sales Invoice\") }}\n
\n
\n {{ doc.name }}\n
\n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n \n
\n
\n
\n", + "content": "\n\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n
\n \n
\n {% endif %}\n
\n
{{ doc.company }}
\n \n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n \n
\n
\n
\n \n
\n
\n {{ _(\"Sales Invoice\") }}\n
\n
\n {{ doc.name }}\n
\n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n \n
\n
\n
\n", "disabled": 0, "docstatus": 0, "doctype": "Letter Head", @@ -41,7 +41,7 @@ "image_width": 0.0, "is_default": 0, "letter_head_name": "Print Format Letter Head", - "modified": "2025-09-15 16:14:24.080812", + "modified": "2025-09-17 12:10:40.229447", "name": "Print Format Letter Head", "source": "HTML" } From f4f2d11fa47fbe774f89767bed43a34bab9e56df Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Wed, 17 Sep 2025 12:37:25 +0530 Subject: [PATCH 17/45] style: always show border even when logo is missing --- erpnext/fixtures/letter_head.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/fixtures/letter_head.json b/erpnext/fixtures/letter_head.json index 41ab9ccd47c..f5bb820fc38 100644 --- a/erpnext/fixtures/letter_head.json +++ b/erpnext/fixtures/letter_head.json @@ -1,7 +1,7 @@ [ { "align": "Left", - "content": "\n\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n
\n \n
\n {% endif %}\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n
\n \n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n
\n
\n
{{ _(\"Invoice:\") }}
\n
{{ doc.name }}

\n
\n
\n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n
\n
\n", + "content": "\n\n
\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n \n {% endif %}\n
\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n
\n \n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n
\n
\n
{{ _(\"Invoice:\") }}
\n
{{ doc.name }}

\n
\n
\n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n
\n
\n", "disabled": 0, "docstatus": 0, "doctype": "Letter Head", @@ -18,13 +18,13 @@ "image_width": 0.0, "is_default": 1, "letter_head_name": "Sales Invoice Letter Head", - "modified": "2025-09-17 11:58:06.023854", + "modified": "2025-09-17 12:31:46.314509", "name": "Sales Invoice Letter Head", "source": "HTML" }, { "align": "Left", - "content": "\n\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n
\n \n
\n {% endif %}\n
\n
{{ doc.company }}
\n \n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n \n
\n
\n
\n \n
\n
\n {{ _(\"Sales Invoice\") }}\n
\n
\n {{ doc.name }}\n
\n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n \n
\n
\n
\n", + "content": "\n\n
\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n \n {% endif %}\n
\n
\n
{{ doc.company }}
\n \n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n \n
\n
\n
\n \n
\n
\n {{ _(\"Sales Invoice\") }}\n
\n
\n {{ doc.name }}\n
\n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n \n
\n
\n
\n", "disabled": 0, "docstatus": 0, "doctype": "Letter Head", @@ -41,7 +41,7 @@ "image_width": 0.0, "is_default": 0, "letter_head_name": "Print Format Letter Head", - "modified": "2025-09-17 12:10:40.229447", + "modified": "2025-09-17 12:31:46.318339", "name": "Print Format Letter Head", "source": "HTML" } From 670361059687c0a31bfb08fc7054b46d0af64e66 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Wed, 17 Sep 2025 13:14:56 +0530 Subject: [PATCH 18/45] fix: do not make letterhead default --- erpnext/fixtures/letter_head.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/fixtures/letter_head.json b/erpnext/fixtures/letter_head.json index f5bb820fc38..48d46ea937b 100644 --- a/erpnext/fixtures/letter_head.json +++ b/erpnext/fixtures/letter_head.json @@ -16,7 +16,7 @@ "image": null, "image_height": 0.0, "image_width": 0.0, - "is_default": 1, + "is_default": 0, "letter_head_name": "Sales Invoice Letter Head", "modified": "2025-09-17 12:31:46.314509", "name": "Sales Invoice Letter Head", From 39b6aab714fb9155dd4227c0441267a13ac3dfe8 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Fri, 19 Sep 2025 02:14:32 +0530 Subject: [PATCH 19/45] fix: update styles to work with wkhtmltopdf rendering --- .../print_format_sales_invoice.html | 355 ++++++------ .../sales_invoice_print_format.html | 504 +++++++++--------- 2 files changed, 456 insertions(+), 403 deletions(-) diff --git a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html index 233083b1f34..392b3af0dc1 100644 --- a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html +++ b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html @@ -2,23 +2,26 @@ print_heading_template=None) -%} {% if letter_head and not no_letterhead %}
{{ letter_head }}
{% endif %} {% if print_heading_template %} {{ frappe.render_template(print_heading_template, {"doc":doc}) }} -{% endif %} {%- if doc.meta.is_submittable and doc.docstatus==2 -%} -
-

{{ _("CANCELLED") }}

-
-{%- endif -%} {%- endmacro -%} {% for page in layout %} +{% endif %} {%- endmacro -%} {% for page in layout %}
{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}
- - - - - - -
-
-
Customer Name:
-
Bill to:
-
-
-
{{ doc.customer_name }}
-
{{ doc.address_display or "" }}
-
- 		-
-
Invoice Number:
-
Invoice Date:
-
Payment Due Date:
-
-
-
{{ doc.name }}
-
{{ frappe.utils.format_date(doc.posting_date) }}
-
{{ frappe.utils.format_date(doc.due_date) }}
-
-
- - - - - - - - - - - - +
+
- - - - - - - - - - {% for item in doc.items %} - - - - - - - + - {% endfor %} - -
{{ _("No") }}{{ _("Item") }}{{ _("HSN/SAC") }}{{ _("Quantity") }}{{ _("Rate") }}{{ _("Amount") }}
{{ loop.index }} -
-
- {% if item.image %} -
- {{ item.item_name }} -
- {% endif %} -
-
{{ item.item_name }}
+
+
+
Customer Name:
+
Bill to:
+
+
+
{{ doc.customer_name }}
+
{{ doc.address_display or "" }}
{{ item.gst_hsn_code }}{{ item.get_formatted("qty", 0) }} {{ item.uom }}{{ item.get_formatted("net_rate", doc) }}{{ item.get_formatted("net_amount", doc) }} +
+
Invoice Number:
+
Invoice Date:
+
Payment Due Date:
+
+
+
{{ doc.name }}
+
{{ frappe.utils.format_date(doc.posting_date) }}
+
{{ frappe.utils.format_date(doc.due_date) }}
+
+
+
- - - + +
 
+ + + + + + + + + + + + + + + + + + + + {% for item in doc.items %} + + + - - + + + + + + {% endfor %} + +
{{ _("No") }}{{ _("Item") }}{{ _("HSN/SAC") }}{{ _("Quantity") }}{{ _("Rate") }}{{ _("Amount") }}
{{ loop.index }} +
+
+ {% if item.image %} +
+ {{ item.item_name }} +
+ {% endif %} +
+
{{ item.item_name }}
+
+ 		- - - - - - - - - - {% set tax_rate = doc.taxes | selectattr("tax_amount") | sum(attribute="rate") %} {% if - tax_rate > 0 %} - - - - - {% endif %} -
{{ _("Sub Total:") }}{{ doc.get_formatted("total", doc) }}
- {{ _("Discount") }} ({{ doc.additional_discount_percentage or 0 }}%): - {{ doc.get_formatted("discount_amount", doc) }}
{{ _("Tax") }} ({{ tax_rate }}%):{{ doc.get_formatted("total_taxes_and_charges", doc) }}
-
{{ item.gst_hsn_code }}{{ item.get_formatted("qty", 0) }} {{ item.uom }}{{ item.get_formatted("net_rate", doc) }}{{ item.get_formatted("net_amount", doc) }}
- - -
+ + + + + - -
  - - + + + + + - + + + {% set tax_rate = doc.taxes | selectattr("tax_amount") | sum(attribute="rate") %} {% + if tax_rate > 0 %} + + + {% endif %}
-
{{ _("In Words: ") }}{{ doc.in_words }}
+
{{ _("Sub Total:") }}{{ doc.get_formatted("total", doc) }}
+ {{ _("Discount") }} ({{ doc.additional_discount_percentage or 0 }}%): {{ _("Grand Total:") }}{{ doc.get_formatted("discount_amount", doc) }}
{{ _("Tax") }} ({{ tax_rate }}%): - - {{ doc.get_formatted("grand_total", doc) }} - + {{ doc.get_formatted("total_taxes_and_charges", doc) }}
- -
- - {% if doc.taxes_and_charges %} - -
{{ _("Tax Breakup") }}
- - - - - {% for row in doc.taxes %} - - {% endfor %} - - - - {% for item in doc.items %} - - - - {% for row in doc.taxes %} {% set tax_amount = item.base_net_amount * (row.rate / 100) %} - - {% endfor %} - {% endfor %} - -
{{ _("HSN/SAC") }}{{ _("Taxable Amount") }}{{ row.description }} ({{ row.rate }}%)
{{ item.gst_hsn_code }}{{ item.get_formatted("base_net_amount", doc) }} - {{ frappe.format_value(tax_amount, {"fieldtype": "Currency"}, doc) }}
- {% endif %} - - {% if doc.terms %} -
-
{{ _("Terms and Conditions") }}
- {{ doc.terms}} + + +
+ + + + + + +
+
+ {{ _("In Words: ") }}{{ doc.in_words }} +
+ 		{{ _("Grand Total:") }} + + {{ doc.get_formatted("grand_total", doc) }} + +
+
+ + + + + {% if doc.taxes_and_charges %} + +
{{ _("Tax Breakup") }}
+ + + + + {% for row in doc.taxes %} + + {% endfor %} + + + + {% for item in doc.items %} + + + + {% for row in doc.taxes %} {% set tax_amount = item.base_net_amount * (row.rate / 100) %} + + {% endfor %} + + {% endfor %} + +
{{ _("HSN/SAC") }}{{ _("Taxable Amount") }}{{ row.description }} ({{ row.rate }}%)
{{ item.gst_hsn_code }}{{ item.get_formatted("base_net_amount", doc) }} + {{ frappe.format_value(tax_amount, {"fieldtype": "Currency"}, doc) }} +
+ {% endif %} + + + {% if doc.terms %} +
+
{{ _("Terms and Conditions") }}
+ {{ doc.terms}} +
+ {% endif %}
- {% endif %}
{% endfor %} diff --git a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html index a97d5f67790..4457b2ac7a6 100644 --- a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html +++ b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html @@ -12,278 +12,304 @@ print_heading_template=None) -%} {% if letter_head and not no_letterhead %} {{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }} - + .title { + color: #7c7c7c !important; + } - - - - - - - - - - - {% set address = (doc.address_display) %} {% if address and address.rstrip().endswith("
") %} {% set - address = address[:-5] %} {% endif %} {% set company_address_display = - (doc.company_address_display) %} {% if company_address_display and company_address_display.rstrip().endswith("
") %} {% - set company_address_display = company_address_display[:-5] %} {% endif %} - - - -
- {{ _("Customer Name") }}: {{doc.customer_name }} - - {{ _("Payment Due Date") }}: {{ - frappe.utils.format_date(doc.due_date) }} -
{{ _("Invoice Number") }}: {{ doc.name }} - {{ _("Invoice Date") }}: {{ - frappe.utils.format_date(doc.posting_date) }} -
{{ _("Bill From") }}:
{{ address }}		{{ _("Bill To") }}:
{{ company_address_display }}
+ .heading { + color: #525252 !important; + font-weight: 300; + } - - - - - - - - - - + .print-format { + color: #171717; + font-size: 14px; + font-style: normal; + font-weight: 420; + line-height: 21px; + padding: 0px; + letter-spacing: 0.14px; + margin-left: 0mm !important; + margin-right: 0mm !important; + } + .letter-head-footer { + margin-top: 0px !important; + } + .print-heading { + margin-top: 0px !important; + margin-bottom: 0px !important; + padding-bottom: 0px !important; + } + +
+
- - - - - + + - - - {% for item in doc.items %} - - - - - + + - {% endfor %} - -
{{ _("No") }}{{ _("Item") }}{{ _("Quantity") }}{{ _("Rate") }}{{ _("Amount") }} + {{ _("Customer Name") }}: {{doc.customer_name }} + + {{ _("Payment Due Date") }}: {{ + frappe.utils.format_date(doc.due_date) }} +
{{ loop.index }}{{ item.item_name }}{{ item.get_formatted("qty", 0) }} {{ item.uom }}{{ item.get_formatted("net_rate", doc) }}{{ item.get_formatted("net_amount", doc) }}{{ _("Invoice Number") }}: {{ doc.name }} + {{ _("Invoice Date") }}: {{ + frappe.utils.format_date(doc.posting_date) }} +
+ + {% set address = (doc.address_display) %} {% if address and address.rstrip().endswith("
") + %} {% set address = address[:-5] %} {% endif %} {% set company_address_display = + (doc.company_address_display) %} {% if company_address_display and + company_address_display.rstrip().endswith("
") %} {% set company_address_display = + company_address_display[:-5] %} {% endif %} + {{ _("Bill From") }}:
{{ address }} + {{ _("Bill To") }}:
{{ company_address_display }} + + - -
-
-
-

{{ _("Total in words") }}

-
{{ doc.in_words }}
-
-
-
- - - - - - - - - - {% set tax_rate = doc.taxes | selectattr("tax_amount") | sum(attribute="rate") %} {% if - tax_rate > 0 %} - - - - - {% endif %} - - - - -
{{ _("Sub Total:") }}{{ doc.get_formatted("total", doc) }}
- {{ _("Discount") }} ({{ doc.additional_discount_percentage }}%): - {{ doc.get_formatted("discount_amount", doc) }}
{{ _("Tax") }} ({{ tax_rate }}%):{{ doc.get_formatted("total_taxes_and_charges", doc) }}
{{ _("Grand Total:") }}{{ doc.get_formatted("grand_total", doc) }}
-
-
- - - {% if doc.taxes_and_charges %} -
{{ _("Tax Breakup") }}
-
- + +
+ + + + + + + - - - {% for row in doc.taxes %} - - {% endfor %} + + + + + {% for item in doc.items %} - - - {% for row in doc.taxes %} {% set tax_amount = item.base_net_amount * (row.rate / 100) %} - + + + + - {% endfor %} {% endfor %}
{{ _("HSN/SAC") }}{{ _("Taxable Amount") }}{{ row.description }}{{ _("No") }}{{ _("Item") }}{{ _("Quantity") }}{{ _("Rate") }}{{ _("Amount") }}
{{ item.gst_hsn_code }}{{ item.get_formatted("base_net_amount", doc) }} - ({{ (row.rate) }}%) {{ frappe.format_value(tax_amount, {"fieldtype": "Currency"}, doc) - }} + {{ loop.index }}{{ item.item_name }}{{ item.get_formatted("qty", 0) }} {{ item.uom }}{{ item.get_formatted("net_rate", doc) }} + {{ item.get_formatted("net_amount", doc) }}
-
- {% endif %} - - {% if doc.terms %} -
-
{{ _("Terms and Conditions") }}
- {{ doc.terms}} + +
+
+
+

{{ _("Total in words") }}

+
{{ doc.in_words }}
+
+
+
+ + + + + + + + + + {% set tax_rate = doc.taxes | selectattr("tax_amount") | sum(attribute="rate") %} {% if + tax_rate > 0 %} + + + + + {% endif %} + + + + +
{{ _("Sub Total:") }}{{ doc.get_formatted("total", doc) }}
+ {{ _("Discount") }} ({{ doc.additional_discount_percentage }}%): + {{ doc.get_formatted("discount_amount", doc) }}
{{ _("Tax") }} ({{ tax_rate }}%):{{ doc.get_formatted("total_taxes_and_charges", doc) }}
{{ _("Grand Total:") }}{{ doc.get_formatted("grand_total", doc) }}
+
+
+ + + {% if doc.taxes_and_charges %} +
{{ _("Tax Breakup") }}
+
+ + + + + + {% for row in doc.taxes %} + + {% endfor %} + + + + {% for item in doc.items %} + + + + {% for row in doc.taxes %} {% set tax_amount = item.base_net_amount * (row.rate / 100) + %} + + {% endfor %} + + {% endfor %} + +
{{ _("HSN/SAC") }}{{ _("Taxable Amount") }}{{ row.description }}
{{ item.gst_hsn_code }}{{ item.get_formatted("base_net_amount", doc) }} + ({{ (row.rate) }}%) {{ frappe.format_value(tax_amount, {"fieldtype": "Currency"}, + doc) }} +
+
+ {% endif %} + + + {% if doc.terms %} +
+
{{ _("Terms and Conditions") }}
+ {{ doc.terms}} +
+ {% endif %}
- {% endif %} {% endfor %} From e22373192491a11ec4d8904d40b256fb51ebfe94 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Fri, 19 Sep 2025 14:09:18 +0530 Subject: [PATCH 20/45] refactor: remove flex usage for better wkhtmltopdf support --- .../print_format_sales_invoice.html | 77 +++++++++++-------- 1 file changed, 45 insertions(+), 32 deletions(-) diff --git a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html index 392b3af0dc1..2042b4271ba 100644 --- a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html +++ b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html @@ -1,8 +1,13 @@ {%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, -print_heading_template=None) -%} {% if letter_head and not no_letterhead %} -
{{ letter_head }}
-{% endif %} {% if print_heading_template %} {{ frappe.render_template(print_heading_template, {"doc":doc}) }} -{% endif %} {%- endmacro -%} {% for page in layout %} +print_heading_template=None) -%} +{% if letter_head and not no_letterhead %} +
{{ letter_head }}
+{% endif %} +{% if print_heading_template %} + {{ frappe.render_template(print_heading_template, {"doc":doc}) }} +{% endif %} +{%- endmacro -%} +{% for page in layout %}
{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }} @@ -11,7 +16,7 @@ print_heading_template=None) -%} {% if letter_head and not no_letterhead %}
- +
From ce19514a2ccc752fa157f6b8720558dd2cbc2862 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Fri, 19 Sep 2025 14:12:49 +0530 Subject: [PATCH 21/45] refactor: update letterhead styles for wkhtmltopdf compatibility --- erpnext/fixtures/letter_head.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/fixtures/letter_head.json b/erpnext/fixtures/letter_head.json index 48d46ea937b..100762fca8b 100644 --- a/erpnext/fixtures/letter_head.json +++ b/erpnext/fixtures/letter_head.json @@ -1,7 +1,7 @@ [ { "align": "Left", - "content": "\n\n
\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n \n {% endif %}\n
\n
\n
{{ doc.company }}
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n
\n \n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n
\n
\n
{{ _(\"Invoice:\") }}
\n
{{ doc.name }}

\n
\n
\n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n
\n
\n", + "content": "\n\n
@@ -219,16 +216,32 @@ print_heading_template=None) -%} {% if letter_head and not no_letterhead %}
{{ loop.index }} -
-
+ + {% if item.image %} -
- {{ item.item_name }} -
+ {% endif %} - -
{{ item.item_name }}
- + + +
+ {{ item.item_name }} + + {{ item.item_name }} +
{{ item.gst_hsn_code }}
\n \n \n \n\n \n\n \n \n \n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n \"Company\n {% endif %}\n
\n 		\n
\n {{ doc.company }}\n
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}\n {{ address.address_line2 }}
\n {% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}\n {% endif %}\n 		\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n\n
\n {{ _(\"Invoice:\") }}\n {{ doc.name }}\n
\n {% if website %}\n
\n {{ _(\"Website:\") }}\n {{ website }}\n
\n {% endif %}\n {% if email %}\n
\n {{ _(\"Email:\") }}\n {{ email }}\n
\n {% endif %}\n {% if phone_no %}\n
\n {{ _(\"Contact:\") }}\n {{ phone_no }}\n
\n {% endif %}\n
\n", "disabled": 0, "docstatus": 0, "doctype": "Letter Head", @@ -18,13 +18,13 @@ "image_width": 0.0, "is_default": 0, "letter_head_name": "Sales Invoice Letter Head", - "modified": "2025-09-17 12:31:46.314509", + "modified": "2025-09-19 14:10:13.265409", "name": "Sales Invoice Letter Head", "source": "HTML" }, { "align": "Left", - "content": "\n\n
\n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n \n {% endif %}\n
\n
\n
{{ doc.company }}
\n \n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n \n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n \n
\n
\n
\n \n
\n
\n {{ _(\"Sales Invoice\") }}\n
\n
\n {{ doc.name }}\n
\n
\n\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n \n {% if website %}\n
\n
{{ _(\"Website:\") }}
\n
{{ website }}

\n
\n {% endif %}\n {% if email %}\n
\n
{{ _(\"Email:\") }}
\n
{{ email }}

\n
\n {% endif %}\n {% if phone_no %}\n
\n
{{ _(\"Contact:\") }}
\n
{{ phone_no }}

\n
\n {% endif %}\n \n
\n
\n
\n", + "content": "\n\n\n \n \n\n \n \n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n
\n \n
\n {% endif %}\n
{{ doc.company }}
\n
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n 		\n
\n
{{ _(\"Sales Invoice\") }}
\n
{{ doc.name }}
\n
\n
\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n {% if website %}\n
{{ _(\"Website:\") }}{{ website }}
\n {% endif %}\n {% if email %}\n
{{ _(\"Email:\") }}{{ email }}
\n {% endif %}\n {% if phone_no %}\n
{{ _(\"Contact:\") }}{{ phone_no }}
\n {% endif %}\n
\n
\n", "disabled": 0, "docstatus": 0, "doctype": "Letter Head", @@ -41,7 +41,7 @@ "image_width": 0.0, "is_default": 0, "letter_head_name": "Print Format Letter Head", - "modified": "2025-09-17 12:31:46.318339", + "modified": "2025-09-19 13:59:22.029272", "name": "Print Format Letter Head", "source": "HTML" } From a6d92e5ec719e665710b256c36ddf9f38cedee98 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Mon, 22 Sep 2025 14:57:45 +0530 Subject: [PATCH 22/45] refactor: small changes for better readability --- .../print_format_sales_invoice.html | 1 + .../sales_invoice_print_format.html | 30 ++++++++++++------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html index 2042b4271ba..f034271f505 100644 --- a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html +++ b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html @@ -230,6 +230,7 @@ print_heading_template=None) -%} max-width: 24px; min-width: 24px; margin-right: 8px; + vertical-align: middle; " /> diff --git a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html index 4457b2ac7a6..d98c30700a9 100644 --- a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html +++ b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html @@ -1,12 +1,18 @@ {%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, -print_heading_template=None) -%} {% if letter_head and not no_letterhead %} +print_heading_template=None) -%} +{% if letter_head and not no_letterhead %}
{{ letter_head }}
-{% endif %} {% if print_heading_template %} {{ frappe.render_template(print_heading_template, {"doc":doc}) }} -{% else %} {% endif %} {%- if doc.meta.is_submittable and doc.docstatus==2-%} +{% endif %} +{% if print_heading_template %} + {{ frappe.render_template(print_heading_template, {"doc":doc}) }} +{% else %} +{% endif %} +{%- if doc.meta.is_submittable and doc.docstatus==2-%}

{{ _("CANCELLED") }}

-{%- endif -%} {%- endmacro -%} {% for page in layout %} +{%- endif -%} +{%- endmacro -%} {% for page in layout %}
{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }} @@ -174,7 +180,7 @@ print_heading_template=None) -%} {% if letter_head and not no_letterhead %} }
- +
- {% set address = (doc.address_display) %} {% if address and address.rstrip().endswith("
") - %} {% set address = address[:-5] %} {% endif %} {% set company_address_display = - (doc.company_address_display) %} {% if company_address_display and - company_address_display.rstrip().endswith("
") %} {% set company_address_display = - company_address_display[:-5] %} {% endif %} + {% set address = (doc.address_display) %} + {% if address and address.rstrip().endswith("
") %} + {% set address = address[:-5] %} + {% endif %} + + {% set company_address_display = (doc.company_address_display) %} + {% if company_address_display and company_address_display.rstrip().endswith("
") %} + {% set company_address_display = company_address_display[:-5] %} + {% endif %} From 842a3645dc41784cd844a7f7c77e44004293caee Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Mon, 22 Sep 2025 15:04:27 +0530 Subject: [PATCH 23/45] refactor: remove tax breakup table from the print format --- .../print_format_sales_invoice.html | 31 ----------------- .../sales_invoice_print_format.html | 33 ------------------- 2 files changed, 64 deletions(-) diff --git a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html index f034271f505..b52da80b3bd 100644 --- a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html +++ b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html @@ -196,7 +196,6 @@ print_heading_template=None) -%} - @@ -205,7 +204,6 @@ print_heading_template=None) -%} - @@ -245,7 +243,6 @@ print_heading_template=None) -%}
{{ _("Customer Name") }}: {{doc.customer_name }} @@ -192,11 +198,15 @@ print_heading_template=None) -%} {% if letter_head and not no_letterhead %}
{{ _("Bill From") }}:
{{ address }}		 {{ _("Bill To") }}:
{{ company_address_display }}
{{ _("No") }} {{ _("Item") }}{{ _("HSN/SAC") }} {{ _("Quantity") }} {{ _("Rate") }} {{ _("Amount") }}
- {{ item.gst_hsn_code }} {{ item.get_formatted("qty", 0) }} {{ item.uom }} {{ item.get_formatted("net_rate", doc) }} {{ item.get_formatted("net_amount", doc) }} @@ -313,34 +310,6 @@ print_heading_template=None) -%} - {% if doc.taxes_and_charges %} - -
{{ _("Tax Breakup") }}
- - - - - {% for row in doc.taxes %} - - {% endfor %} - - - - {% for item in doc.items %} - - - - {% for row in doc.taxes %} {% set tax_amount = item.base_net_amount * (row.rate / 100) %} - - {% endfor %} - - {% endfor %} - -
{{ _("HSN/SAC") }}{{ _("Taxable Amount") }}{{ row.description }} ({{ row.rate }}%)
{{ item.gst_hsn_code }}{{ item.get_formatted("base_net_amount", doc) }} - {{ frappe.format_value(tax_amount, {"fieldtype": "Currency"}, doc) }} -
- {% endif %} - {% if doc.terms %}
diff --git a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html index d98c30700a9..b77aff84ed7 100644 --- a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html +++ b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html @@ -280,39 +280,6 @@ print_heading_template=None) -%}
- - {% if doc.taxes_and_charges %} -
{{ _("Tax Breakup") }}
-
- - - - - - {% for row in doc.taxes %} - - {% endfor %} - - - - {% for item in doc.items %} - - - - {% for row in doc.taxes %} {% set tax_amount = item.base_net_amount * (row.rate / 100) - %} - - {% endfor %} - - {% endfor %} - -
{{ _("HSN/SAC") }}{{ _("Taxable Amount") }}{{ row.description }}
{{ item.gst_hsn_code }}{{ item.get_formatted("base_net_amount", doc) }} - ({{ (row.rate) }}%) {{ frappe.format_value(tax_amount, {"fieldtype": "Currency"}, - doc) }} -
-
- {% endif %} - {% if doc.terms %}
From f6ebf2d0b3f97ea6dff1c8c115ac4782f994b426 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Tue, 23 Sep 2025 13:05:50 +0530 Subject: [PATCH 24/45] feat: letterhead for print format --- .../accounts/letterhead/letterhead_plain.html | 122 +++++++++++++++++ .../letterhead_with_background_colour.html | 124 ++++++++++++++++++ erpnext/fixtures/letter_head.json | 48 ------- erpnext/hooks.py | 7 - 4 files changed, 246 insertions(+), 55 deletions(-) create mode 100644 erpnext/accounts/letterhead/letterhead_plain.html create mode 100644 erpnext/accounts/letterhead/letterhead_with_background_colour.html delete mode 100644 erpnext/fixtures/letter_head.json diff --git a/erpnext/accounts/letterhead/letterhead_plain.html b/erpnext/accounts/letterhead/letterhead_plain.html new file mode 100644 index 00000000000..54845f3e401 --- /dev/null +++ b/erpnext/accounts/letterhead/letterhead_plain.html @@ -0,0 +1,122 @@ + + + + + + + + + + + + +
+
+ {% set company_logo = frappe.db.get_value("Company", doc.company, "company_logo") %} + {% if company_logo %} + Company Logo + {% endif %} +
+ 		+
+ {{ doc.company }} +
+ {% set company_address = frappe.get_all( + "Dynamic Link", + fields=["parent"], + filters={ + "link_doctype": "Company", + "link_name": doc.company, + "parenttype": "Address" + }, + limit=1 + ) %} + {% if company_address %} + {% set address = frappe.get_doc("Address", company_address[0].parent) %} + {{ address.address_line1 or "" }}
+ {% if address.address_line2 %} + {{ address.address_line2 }}
+ {% endif %} + {{ address.city or "" }} {{ address.state or "" }} {{ address.pincode or "" }} {{ address.country or "" }} + {% endif %} + 		+ {% set website = frappe.db.get_value("Company", doc.company, "website") %} + {% set email = frappe.db.get_value("Company", doc.company, "email") %} + {% set phone_no = frappe.db.get_value("Company", doc.company, "phone_no") %} + +
+ {{ _("Invoice:") }} + {{ doc.name }} +
+ {% if website %} +
+ {{ _("Website:") }} + {{ website }} +
+ {% endif %} + {% if email %} +
+ {{ _("Email:") }} + {{ email }} +
+ {% endif %} + {% if phone_no %} +
+ {{ _("Contact:") }} + {{ phone_no }} +
+ {% endif %} +
diff --git a/erpnext/accounts/letterhead/letterhead_with_background_colour.html b/erpnext/accounts/letterhead/letterhead_with_background_colour.html new file mode 100644 index 00000000000..f9c001482f4 --- /dev/null +++ b/erpnext/accounts/letterhead/letterhead_with_background_colour.html @@ -0,0 +1,124 @@ + + + + + + + + +
+ {% set company_logo = frappe.db.get_value("Company", doc.company, "company_logo") %} + {% if company_logo %} + + {% endif %} +
{{ doc.company }}
+
+ {% set company_address = frappe.get_all( + "Dynamic Link", + fields=["parent"], + filters={ + "link_doctype": "Company", + "link_name": doc.company, + "parenttype": "Address" + }, + limit=1 + ) %} + {% if company_address %} + {% set address = frappe.get_doc("Address", company_address[0].parent) %} + {{ address.address_line1 or "" }}
+ {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %} + {{ address.city or "" }} {{ address.state or "" }} {{ address.pincode or "" }} {{ address.country or "" }}
+ {% endif %} +
+ 		+
+
{{ _("Sales Invoice") }}
+
{{ doc.name }}
+
+
+
+ {% set website = frappe.db.get_value("Company", doc.company, "website") %} + {% set email = frappe.db.get_value("Company", doc.company, "email") %} + {% set phone_no = frappe.db.get_value("Company", doc.company, "phone_no") %} + + {% if website %} +
{{ _("Website:") }}{{ website }}
+ {% endif %} + {% if email %} +
{{ _("Email:") }}{{ email }}
+ {% endif %} + {% if phone_no %} +
{{ _("Contact:") }}{{ phone_no }}
+ {% endif %} +
+
diff --git a/erpnext/fixtures/letter_head.json b/erpnext/fixtures/letter_head.json deleted file mode 100644 index 100762fca8b..00000000000 --- a/erpnext/fixtures/letter_head.json +++ /dev/null @@ -1,48 +0,0 @@ -[ - { - "align": "Left", - "content": "\n\n\n \n \n \n\n \n\n \n \n \n
\n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n \"Company\n {% endif %}\n
\n 		\n
\n {{ doc.company }}\n
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}\n {{ address.address_line2 }}
\n {% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}\n {% endif %}\n 		\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n\n
\n {{ _(\"Invoice:\") }}\n {{ doc.name }}\n
\n {% if website %}\n
\n {{ _(\"Website:\") }}\n {{ website }}\n
\n {% endif %}\n {% if email %}\n
\n {{ _(\"Email:\") }}\n {{ email }}\n
\n {% endif %}\n {% if phone_no %}\n
\n {{ _(\"Contact:\") }}\n {{ phone_no }}\n
\n {% endif %}\n
\n", - "disabled": 0, - "docstatus": 0, - "doctype": "Letter Head", - "footer": null, - "footer_align": "Left", - "footer_image": null, - "footer_image_height": 0.0, - "footer_image_width": 0.0, - "footer_script": null, - "footer_source": "HTML", - "header_script": null, - "image": null, - "image_height": 0.0, - "image_width": 0.0, - "is_default": 0, - "letter_head_name": "Sales Invoice Letter Head", - "modified": "2025-09-19 14:10:13.265409", - "name": "Sales Invoice Letter Head", - "source": "HTML" - }, - { - "align": "Left", - "content": "\n\n\n \n \n\n \n \n
\n {% set company_logo = frappe.db.get_value(\"Company\", doc.company, \"company_logo\") %}\n {% if company_logo %}\n
\n \n
\n {% endif %}\n
{{ doc.company }}
\n
\n {% set company_address = frappe.get_all(\n \"Dynamic Link\",\n fields=[\"parent\"],\n filters={\n \"link_doctype\": \"Company\",\n \"link_name\": doc.company,\n \"parenttype\": \"Address\"\n },\n limit=1\n ) %}\n {% if company_address %}\n {% set address = frappe.get_doc(\"Address\", company_address[0].parent) %}\n {{ address.address_line1 or \"\" }}
\n {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %}\n {{ address.city or \"\" }} {{ address.state or \"\" }} {{ address.pincode or \"\" }} {{ address.country or \"\" }}
\n {% endif %}\n
\n 		\n
\n
{{ _(\"Sales Invoice\") }}
\n
{{ doc.name }}
\n
\n
\n
\n {% set website = frappe.db.get_value(\"Company\", doc.company, \"website\") %}\n {% set email = frappe.db.get_value(\"Company\", doc.company, \"email\") %}\n {% set phone_no = frappe.db.get_value(\"Company\", doc.company, \"phone_no\") %}\n \n {% if website %}\n
{{ _(\"Website:\") }}{{ website }}
\n {% endif %}\n {% if email %}\n
{{ _(\"Email:\") }}{{ email }}
\n {% endif %}\n {% if phone_no %}\n
{{ _(\"Contact:\") }}{{ phone_no }}
\n {% endif %}\n
\n
\n", - "disabled": 0, - "docstatus": 0, - "doctype": "Letter Head", - "footer": null, - "footer_align": "Left", - "footer_image": null, - "footer_image_height": 0.0, - "footer_image_width": 0.0, - "footer_script": null, - "footer_source": "HTML", - "header_script": null, - "image": null, - "image_height": 0.0, - "image_width": 0.0, - "is_default": 0, - "letter_head_name": "Print Format Letter Head", - "modified": "2025-09-19 13:59:22.029272", - "name": "Print Format Letter Head", - "source": "HTML" - } -] \ No newline at end of file diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 213efd9a0f6..234dcc6eac1 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -600,13 +600,6 @@ user_privacy_documents = [ }, ] -fixtures = [ - { - "dt": "Letter Head", - "filters": [["name", "in", ["Sales Invoice Letter Head", "Print Format Letter Head"]]], - } -] - # ERPNext doctypes for Global Search global_search_doctypes = { From 0d58dfd0fa0824fb593eb7707a2b3f114e0f9eee Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Thu, 25 Sep 2025 11:34:30 +0530 Subject: [PATCH 25/45] feat: add default letterhead with HTML template via after_install --- .../accounts/letterhead/letterhead_plain.html | 1 + erpnext/setup/install.py | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/erpnext/accounts/letterhead/letterhead_plain.html b/erpnext/accounts/letterhead/letterhead_plain.html index 54845f3e401..1dce3c51063 100644 --- a/erpnext/accounts/letterhead/letterhead_plain.html +++ b/erpnext/accounts/letterhead/letterhead_plain.html @@ -28,6 +28,7 @@ max-width: 90px; max-height: 90px; display: inline-block; + border-radius: 15px; } .company-details { width: 40%; diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py index fd98e124d70..7a6cff20563 100644 --- a/erpnext/setup/install.py +++ b/erpnext/setup/install.py @@ -2,6 +2,8 @@ # License: GNU General Public License v3. See license.txt +import os + import frappe from frappe import _ from frappe.custom.doctype.custom_field.custom_field import create_custom_fields @@ -34,6 +36,7 @@ def after_install(): update_roles() make_default_operations() update_pegged_currencies() + create_letter_head() frappe.db.commit() @@ -279,6 +282,38 @@ def update_pegged_currencies(): doc.save() +def create_letter_head(): + base_path = frappe.get_app_path("erpnext", "letterhead") + letterhead_with_background_colour = frappe.read_file( + os.path.join(base_path, "letterhead_with_background_colour.html") + ) + letterhead_plain = frappe.read_file(os.path.join(base_path, "letterhead_plain.html")) + + if not frappe.db.exists("Letter Head", "Letterhead with background colour"): + doc = frappe.get_doc( + { + "doctype": "Letter Head", + "letter_head_name": "Letterhead with background colour", + "source": "HTML", + "content": letterhead_with_background_colour, + } + ) + doc.insert(ignore_permissions=True) + frappe.db.commit() + + if not frappe.db.exists("Letter Head", "Letterhead Plain"): + doc = frappe.get_doc( + { + "doctype": "Letter Head", + "letter_head_name": "Letterhead plain", + "source": "HTML", + "content": letterhead_plain, + } + ) + doc.insert(ignore_permissions=True) + frappe.db.commit() + + DEFAULT_ROLE_PROFILES = { "Inventory": [ "Stock User", From 3abdfcb269a4771fa594b9ded9dcab8a90c947d7 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Thu, 25 Sep 2025 13:08:54 +0530 Subject: [PATCH 26/45] fix: app path correctly --- erpnext/setup/install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py index 7a6cff20563..80eb30d08af 100644 --- a/erpnext/setup/install.py +++ b/erpnext/setup/install.py @@ -283,7 +283,7 @@ def update_pegged_currencies(): def create_letter_head(): - base_path = frappe.get_app_path("erpnext", "letterhead") + base_path = frappe.get_app_path("erpnext", "accounts", "letterhead") letterhead_with_background_colour = frappe.read_file( os.path.join(base_path, "letterhead_with_background_colour.html") ) From 6494fc42c6b2b2745b459d5c5fb8d53ca042471e Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Thu, 25 Sep 2025 13:13:37 +0530 Subject: [PATCH 27/45] refactor: create_letter_head for readability --- erpnext/setup/install.py | 44 ++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py index 80eb30d08af..ca734a3a7e1 100644 --- a/erpnext/setup/install.py +++ b/erpnext/setup/install.py @@ -284,34 +284,26 @@ def update_pegged_currencies(): def create_letter_head(): base_path = frappe.get_app_path("erpnext", "accounts", "letterhead") - letterhead_with_background_colour = frappe.read_file( - os.path.join(base_path, "letterhead_with_background_colour.html") - ) - letterhead_plain = frappe.read_file(os.path.join(base_path, "letterhead_plain.html")) - if not frappe.db.exists("Letter Head", "Letterhead with background colour"): - doc = frappe.get_doc( - { - "doctype": "Letter Head", - "letter_head_name": "Letterhead with background colour", - "source": "HTML", - "content": letterhead_with_background_colour, - } - ) - doc.insert(ignore_permissions=True) - frappe.db.commit() + letterheads = { + "Letterhead with background colour": "letterhead_with_background_colour.html", + "Letterhead Plain": "letterhead_plain.html", + } - if not frappe.db.exists("Letter Head", "Letterhead Plain"): - doc = frappe.get_doc( - { - "doctype": "Letter Head", - "letter_head_name": "Letterhead plain", - "source": "HTML", - "content": letterhead_plain, - } - ) - doc.insert(ignore_permissions=True) - frappe.db.commit() + for name, filename in letterheads.items(): + if not frappe.db.exists("Letter Head", name): + content = frappe.read_file(os.path.join(base_path, filename)) + doc = frappe.get_doc( + { + "doctype": "Letter Head", + "letter_head_name": name, + "source": "HTML", + "content": content, + } + ) + doc.insert(ignore_permissions=True) + + frappe.db.commit() DEFAULT_ROLE_PROFILES = { From dbf9faa87ca9c0fee06b7f704affdec28120c253 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Mon, 29 Sep 2025 18:12:15 +0530 Subject: [PATCH 28/45] feat: prompt user to input company logo and address if missing in print preview --- .../doctype/sales_invoice/sales_invoice.py | 73 ++++++++++++ erpnext/hooks.py | 2 + erpnext/public/js/print.js | 112 ++++++++++++++++++ 3 files changed, 187 insertions(+) create mode 100644 erpnext/public/js/print.js diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 929db4895ad..a425d507f7b 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -279,6 +279,29 @@ class SalesInvoice(SellingController): self.indicator_color = "green" self.indicator_title = _("Paid") + def before_print(self, settings=None): + from frappe.contacts.doctype.address.address import get_address_display_list + + company_logo = frappe.get_value("Company", self.company, ["company_logo"]) + address_display_list = get_address_display_list("Company", self.company) + + address_line = "" + if address_display_list and len(address_display_list) > 0: + address_line = address_display_list[0]["address_line1"] + + if not address_line or not company_logo or not self.company_address: + frappe.publish_realtime( + "sales_invoice_before_print", + { + "company_logo": company_logo, + "address_line": address_line, + "company": self.company, + "company_address_display": self.company_address, + "name": self.name, + }, + user=frappe.session.user, + ) + def validate(self): self.validate_auto_set_posting_time() super().validate() @@ -2802,6 +2825,56 @@ def get_loyalty_programs(customer): return lp_details +@frappe.whitelist() +def save_company_master_details(name, company, details): + if isinstance(details, str): + details = frappe.parse_json(details) + + if details.get("company_logo"): + frappe.db.set_value( + "Company", + company, + { + "company_logo": details.get("company_logo"), + }, + ) + + company_address = None + if details.get("address_line1"): + address = frappe.get_doc( + { + "doctype": "Address", + "address_title": details.get("address_title"), + "address_type": details.get("address_type"), + "address_line1": details.get("address_line1"), + "city": details.get("city"), + "state": details.get("state"), + "pincode": details.get("pincode"), + "country": details.get("country"), + "is_your_company_address": 1, + "links": [{"link_doctype": "Company", "link_name": company}], + } + ).insert(ignore_permissions=True) + + company_address = address.name + else: + company_address = details.get("company_address") + + if company_address: + current_display = frappe.db.get_value("Sales Invoice", name, "company_address_display") + if not current_display or details.get("address_line1"): + frappe.db.set_value( + "Sales Invoice", + name, + { + "company_address": company_address, + "company_address_display": get_address_display(company_address), + }, + ) + + return True + + @frappe.whitelist() def create_invoice_discounting(source_name, target_doc=None): invoice = frappe.get_doc("Sales Invoice", source_name) diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 234dcc6eac1..3582eb7c30d 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -51,6 +51,8 @@ doctype_list_js = { ], } +page_js = {"print": "public/js/print.js"} + extend_doctype_class = {"Address": "erpnext.accounts.custom.address.ERPNextAddress"} override_whitelisted_methods = {"frappe.www.contact.send_message": "erpnext.templates.utils.send_message"} diff --git a/erpnext/public/js/print.js b/erpnext/public/js/print.js new file mode 100644 index 00000000000..20a040f45c4 --- /dev/null +++ b/erpnext/public/js/print.js @@ -0,0 +1,112 @@ +let beforePrintHandled = false; + +frappe.realtime.on("sales_invoice_before_print", (data) => { + const route = frappe.get_route(); + + if (!beforePrintHandled && route[0] === "print" && route[1] === "Sales Invoice") { + beforePrintHandled = true; + let companyDetailsDialog = new frappe.ui.Dialog({ + title: "Enter Company Details", + fields: [ + { + label: "Company Logo", + fieldname: "company_logo", + fieldtype: "Attach Image", + reqd: data.company_logo ? 0 : 1, + hidden: data.company_logo ? 1 : 0, + }, + { + label: "Address Title", + fieldname: "address_title", + fieldtype: "Data", + reqd: data.address_line ? 0 : 1, + hidden: data.address_line ? 1 : 0, + }, + { + label: "Address Line 1", + fieldname: "address_line1", + fieldtype: "Data", + reqd: data.address_line ? 0 : 1, + hidden: data.address_line ? 1 : 0, + }, + { + label: "Address Type", + fieldname: "address_type", + fieldtype: "Select", + options: ["Billing", "Shipping"], + default: "Billing", + reqd: data.address_line ? 0 : 1, + hidden: data.address_line ? 1 : 0, + }, + { + label: "City", + fieldname: "city", + fieldtype: "Data", + reqd: data.address_line ? 0 : 1, + hidden: data.address_line ? 1 : 0, + }, + { + label: "State", + fieldname: "state", + fieldtype: "Data", + hidden: data.address_line ? 1 : 0, + }, + { + label: "Country", + fieldname: "country", + fieldtype: "Link", + options: "Country", + reqd: data.address_line ? 0 : 1, + hidden: data.address_line ? 1 : 0, + }, + { + label: "Postal Code", + fieldname: "pincode", + fieldtype: "Data", + hidden: data.address_line ? 1 : 0, + }, + { + label: "Select Company Address", + fieldname: "company_address", + fieldtype: "Link", + options: "Address", + get_query: function () { + return { + filters: { + link_doctype: "Company", + link_name: data.company, + }, + }; + }, + reqd: data.address_line ? 1 : 0, + hidden: data.address_line ? 0 : 1, + }, + ], + primary_action_label: "Save", + primary_action(values) { + frappe.call({ + method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.save_company_master_details", + args: { + name: data.name, + company: data.company, + details: values, + }, + callback: function () { + companyDetailsDialog.hide(); + frappe.msgprint(__("Saving document...")); + setTimeout(() => { + window.location.reload(); + }, 1000); + }, + }); + }, + }); + companyDetailsDialog.show(); + } +}); +frappe.router.on("change", () => { + const route = frappe.get_route(); + if (route[0] !== "print" || route[1] !== "Sales Invoice") { + beforePrintHandled = false; + } +}); From 780d3f5ba4adb1673bec4c096303bc2ffb0b2178 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Mon, 29 Sep 2025 23:10:02 +0530 Subject: [PATCH 29/45] fix: better sub total section with tax breakup --- .../print_format_sales_invoice.html | 102 +++++++++--------- 1 file changed, 48 insertions(+), 54 deletions(-) diff --git a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html index b52da80b3bd..0d04bd9be34 100644 --- a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html +++ b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html @@ -251,64 +251,58 @@ print_heading_template=None) -%} - - - +
+
 
+ + + + - - + {%- endif -%} + {%- endfor -%} + {%- if doc.apply_discount_on == "Grand Total" -%} + + + + + {%- endif -%} +
{{ _("Sub Total:") }}{{ doc.get_formatted("total", doc) }}
- + {%- if doc.apply_discount_on == "Net Total" -%} + + + + + {%- endif -%} + {%- for tax in doc.taxes -%} + {%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%} - - + + - - - - - {% set tax_rate = doc.taxes | selectattr("tax_amount") | sum(attribute="rate") %} {% - if tax_rate > 0 %} - - - - - {% endif %} -
+ {{ _("Discount") }} ({{ doc.additional_discount_percentage }}%): + {{ doc.get_formatted("discount_amount", doc) }}
{{ _("Sub Total:") }}{{ doc.get_formatted("total", doc) }}{{ tax.get_formatted("description") }} ({{ tax.get_formatted("rate") }}%):{{ tax.get_formatted("tax_amount") }}
- {{ _("Discount") }} ({{ doc.additional_discount_percentage or 0 }}%): - {{ doc.get_formatted("discount_amount", doc) }}
{{ _("Tax") }} ({{ tax_rate }}%): - {{ doc.get_formatted("total_taxes_and_charges", doc) }} -
-
+ {{ _("Discount") }} ({{ doc.additional_discount_percentage }}%): + {{ doc.get_formatted("discount_amount", doc) }}
+
+ +
+ + + + + + +
+
+ {{ _("In Words: ") }}{{ doc.in_words }} +
+ 		{{ _("Grand Total:") }} + + {{ doc.get_formatted("grand_total", doc) }} + +
+
- - -
- - - - - - -
-
- {{ _("In Words: ") }}{{ doc.in_words }} -
- 		{{ _("Grand Total:") }} - - {{ doc.get_formatted("grand_total", doc) }} - -
-
- - - {% if doc.terms %} From bf6c331ac4ad801613978a202849b89554873c45 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Tue, 30 Sep 2025 10:52:25 +0530 Subject: [PATCH 30/45] fix: show tax breakup in print format --- .../print_format_sales_invoice.html | 4 +- .../sales_invoice_print_format.html | 79 +++++++++++-------- 2 files changed, 48 insertions(+), 35 deletions(-) diff --git a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html index 0d04bd9be34..3716b816085 100644 --- a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html +++ b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html @@ -285,8 +285,8 @@ print_heading_template=None) -%}
-
- +
+
+ + +
diff --git a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html index b77aff84ed7..9bdcde2c18a 100644 --- a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html +++ b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html @@ -118,6 +118,9 @@ print_heading_template=None) -%} .pb-8 { padding-bottom: 8px; } + .amount-width { + width: 110px; + } .totals-table { border-radius: 5px; @@ -216,8 +219,8 @@ print_heading_template=None) -%} - - + + @@ -246,47 +249,57 @@ print_heading_template=None) -%}
-
-
-
-

{{ _("Total in words") }}

-
{{ doc.in_words }}
-
-
-
+ + + +
+

{{ _("Total in words") }}

+
{{ doc.in_words }}
+ 		- + - - - - - {% set tax_rate = doc.taxes | selectattr("tax_amount") | sum(attribute="rate") %} {% if - tax_rate > 0 %} - - - - - {% endif %} + {%- if doc.apply_discount_on == "Net Total" -%} + + + + + {%- endif -%} + {%- for tax in doc.taxes -%} + {%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%} + + + + + {%- endif -%} + {%- endfor -%} + {%- if doc.apply_discount_on == "Grand Total" -%} + + + + + {%- endif -%} - +
{{ _("Sub Total:") }}{{ doc.get_formatted("total", doc) }}{{ doc.get_formatted("total", doc) }}
- {{ _("Discount") }} ({{ doc.additional_discount_percentage }}%): - {{ doc.get_formatted("discount_amount", doc) }}
{{ _("Tax") }} ({{ tax_rate }}%):{{ doc.get_formatted("total_taxes_and_charges", doc) }}
+ {{ _("Discount") }} ({{ doc.additional_discount_percentage }}%): + {{ doc.get_formatted("discount_amount", doc) }}
{{ tax.get_formatted("description") }} ({{ tax.get_formatted("rate") }}%):{{ tax.get_formatted("tax_amount") }}
+ {{ _("Discount") }} ({{ doc.additional_discount_percentage }}%): + {{ doc.get_formatted("discount_amount", doc) }}
{{ _("Grand Total:") }}{{ doc.get_formatted("grand_total", doc) }}{{ doc.get_formatted("grand_total", doc) }}
- - +
- {% if doc.terms %} -
-
{{ _("Terms and Conditions") }}
- {{ doc.terms}} -
- {% endif %} +
+ {% if doc.terms %} +
+
{{ _("Terms and Conditions") }}
+ {{ doc.terms}} +
+ {% endif %}
{% endfor %} From 301b294da994d9a3c56694e048ac8e032644e507 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Tue, 30 Sep 2025 12:36:00 +0530 Subject: [PATCH 31/45] style: fix layout issues with extended data --- .../print_format_sales_invoice.html | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html index 3716b816085..5a0feffb8df 100644 --- a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html +++ b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html @@ -165,7 +165,7 @@ print_heading_template=None) -%}
- - From 8a19dc4a20a89f513f773f7f1a884823314ffcc9 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Tue, 30 Sep 2025 13:29:47 +0530 Subject: [PATCH 32/45] style: format and display the address for improved visual clarity --- .../accounts/letterhead/letterhead_plain.html | 23 +- .../letterhead_with_background_colour.html | 220 +++++++++--------- .../print_format_sales_invoice.html | 10 +- .../sales_invoice_print_format.html | 27 ++- 4 files changed, 140 insertions(+), 140 deletions(-) diff --git a/erpnext/accounts/letterhead/letterhead_plain.html b/erpnext/accounts/letterhead/letterhead_plain.html index 1dce3c51063..2b0277343b0 100644 --- a/erpnext/accounts/letterhead/letterhead_plain.html +++ b/erpnext/accounts/letterhead/letterhead_plain.html @@ -32,6 +32,7 @@ } .company-details { width: 40%; + align-content: center; } .company-name { font-size: 14px; @@ -70,23 +71,11 @@
{{ doc.company }}
- {% set company_address = frappe.get_all( - "Dynamic Link", - fields=["parent"], - filters={ - "link_doctype": "Company", - "link_name": doc.company, - "parenttype": "Address" - }, - limit=1 - ) %} - {% if company_address %} - {% set address = frappe.get_doc("Address", company_address[0].parent) %} - {{ address.address_line1 or "" }}
- {% if address.address_line2 %} - {{ address.address_line2 }}
- {% endif %} - {{ address.city or "" }} {{ address.state or "" }} {{ address.pincode or "" }} {{ address.country or "" }} + {% if doc.company_address %} + {% set company_address_display = frappe.get_doc("Address", doc.company_address) %} + {{ company_address_display.address_line1 or "" }} + {% if company_address_display.address_line2 %}{{ company_address_display.address_line2 }}{% endif %}
+ {{ company_address_display.city or "" }} {{ company_address_display.state or "" }} {{ company_address_display.pincode or "" }} {{ company_address_display.country or "" }}
{% endif %} diff --git a/erpnext/accounts/letterhead/letterhead_with_background_colour.html b/erpnext/accounts/letterhead/letterhead_with_background_colour.html index f9c001482f4..ad949d187e4 100644 --- a/erpnext/accounts/letterhead/letterhead_with_background_colour.html +++ b/erpnext/accounts/letterhead/letterhead_with_background_colour.html @@ -1,124 +1,122 @@
+
Customer Name:
Bill to:
@@ -176,15 +176,23 @@ print_heading_template=None) -%}
-
+
+
Invoice Number:
+
+
+
{{ doc.name }}
+
+
Invoice Date:
+
+
+
{{ frappe.utils.format_date(doc.posting_date) }}
+
+
Payment Due Date:
-
-
{{ doc.name }}
-
{{ frappe.utils.format_date(doc.posting_date) }}
+
{{ frappe.utils.format_date(doc.due_date) }}
- - + + + - - -
- {% set company_logo = frappe.db.get_value("Company", doc.company, "company_logo") %} - {% if company_logo %} - - {% endif %} -
{{ doc.company }}
-
- {% set company_address = frappe.get_all( - "Dynamic Link", - fields=["parent"], - filters={ - "link_doctype": "Company", - "link_name": doc.company, - "parenttype": "Address" - }, - limit=1 - ) %} - {% if company_address %} - {% set address = frappe.get_doc("Address", company_address[0].parent) %} - {{ address.address_line1 or "" }}
- {% if address.address_line2 %}{{ address.address_line2 }}
{% endif %} - {{ address.city or "" }} {{ address.state or "" }} {{ address.pincode or "" }} {{ address.country or "" }}
- {% endif %} -
-
+ {% set company_logo = frappe.db.get_value("Company", doc.company, "company_logo") %} {% if + company_logo %} + + {% endif %} +
{{ doc.company }}
+
+ {% if doc.company_address %} {% set company_address_display = frappe.get_doc("Address", + doc.company_address) %} {{ company_address_display.address_line1 or "" }} {% if + company_address_display.address_line2 %}{{ company_address_display.address_line2 }}
{% + endif %} {{ company_address_display.city or "" }} {{ company_address_display.state or "" + }} {{ company_address_display.pincode or "" }} {{ company_address_display.country or "" + }}
+ {% endif %} +
+ 		-
-
{{ _("Sales Invoice") }}
-
{{ doc.name }}
-
-
-
- {% set website = frappe.db.get_value("Company", doc.company, "website") %} - {% set email = frappe.db.get_value("Company", doc.company, "email") %} - {% set phone_no = frappe.db.get_value("Company", doc.company, "phone_no") %} - - {% if website %} -
{{ _("Website:") }}{{ website }}
- {% endif %} - {% if email %} -
{{ _("Email:") }}{{ email }}
- {% endif %} - {% if phone_no %} -
{{ _("Contact:") }}{{ phone_no }}
- {% endif %} -
-
+
+
+
{{ _("Sales Invoice") }}
+
{{ doc.name }}
+
+
+
+ {% set website = frappe.db.get_value("Company", doc.company, "website") %} {% set email = + frappe.db.get_value("Company", doc.company, "email") %} {% set phone_no = + frappe.db.get_value("Company", doc.company, "phone_no") %} {% if website %} +
+ {{ _("Website:") }}{{ website }} +
+ {% endif %} {% if email %} +
+ {{ _("Email:") }}{{ email }} +
+ {% endif %} {% if phone_no %} +
+ {{ _("Contact:") }}{{ phone_no }} +
+ {% endif %} +
+
diff --git a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html index 5a0feffb8df..7cc20b6e912 100644 --- a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html +++ b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html @@ -172,7 +172,15 @@ print_heading_template=None) -%}
{{ doc.customer_name }}
-
{{ doc.address_display or "" }}
+
+ {% if doc.customer_address %} + {% set customer_address = frappe.get_doc("Address", doc.customer_address) %} + {{ customer_address.address_line1 or "" }}
+ {% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
{% endif %} + {{ customer_address.city or "" }} {{ customer_address.state or "" }} {{ customer_address.pincode or "" }} {{ customer_address.country or "" }}
+ {% endif %} +
+
diff --git a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html index 9bdcde2c18a..745c918b8aa 100644 --- a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html +++ b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html @@ -201,17 +201,22 @@ print_heading_template=None) -%} - {% set address = (doc.address_display) %} - {% if address and address.rstrip().endswith("
") %} - {% set address = address[:-5] %} - {% endif %} - - {% set company_address_display = (doc.company_address_display) %} - {% if company_address_display and company_address_display.rstrip().endswith("
") %} - {% set company_address_display = company_address_display[:-5] %} - {% endif %} - {{ _("Bill From") }}:
{{ address }} - {{ _("Bill To") }}:
{{ company_address_display }} + {{ _("Bill From") }}:
+ {% if doc.customer_address %} + {% set customer_address = frappe.get_doc("Address", doc.customer_address) %} + {{ customer_address.address_line1 or "" }} + {% if customer_address.address_line2 %}{{ customer_address.address_line2 }}{% endif %}
+ {{ customer_address.city or "" }} {{ customer_address.state or "" }} {{ customer_address.pincode or "" }} {{ customer_address.country or "" }}
+ {% endif %} + + {{ _("Bill To") }}:
+ {% if doc.company_address %} + {% set company_address_display = frappe.get_doc("Address", doc.company_address) %} + {{ company_address_display.address_line1 or "" }} + {% if company_address_display.address_line2 %}{{ company_address_display.address_line2 }}{% endif %}
+ {{ company_address_display.city or "" }} {{ company_address_display.state or "" }} {{ company_address_display.pincode or "" }} {{ company_address_display.country or "" }}
+ {% endif %} + From abc7bf2fd692de5b7c667f7ae8b83f140eda814e Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Wed, 1 Oct 2025 10:58:17 +0530 Subject: [PATCH 33/45] style: add company and customer name on bill_to and bill_from section --- .../sales_invoice_print_format/sales_invoice_print_format.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html index 745c918b8aa..d74ba323301 100644 --- a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html +++ b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html @@ -204,6 +204,7 @@ print_heading_template=None) -%} {{ _("Bill From") }}:
{% if doc.customer_address %} {% set customer_address = frappe.get_doc("Address", doc.customer_address) %} + {{ doc.customer_name }}
{{ customer_address.address_line1 or "" }} {% if customer_address.address_line2 %}{{ customer_address.address_line2 }}{% endif %}
{{ customer_address.city or "" }} {{ customer_address.state or "" }} {{ customer_address.pincode or "" }} {{ customer_address.country or "" }}
@@ -212,6 +213,7 @@ print_heading_template=None) -%} {{ _("Bill To") }}:
{% if doc.company_address %} {% set company_address_display = frappe.get_doc("Address", doc.company_address) %} + {{ doc.company }}
{{ company_address_display.address_line1 or "" }} {% if company_address_display.address_line2 %}{{ company_address_display.address_line2 }}{% endif %}
{{ company_address_display.city or "" }} {{ company_address_display.state or "" }} {{ company_address_display.pincode or "" }} {{ company_address_display.country or "" }}
From 98838b1dd5b397ee648b20a8929bae700066feba Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Wed, 1 Oct 2025 12:47:42 +0530 Subject: [PATCH 34/45] feat: input website, email, phone_no if not already set in company --- .../doctype/sales_invoice/sales_invoice.py | 49 +++++++++++-------- erpnext/public/js/print.js | 45 ++++++++++++++--- 2 files changed, 65 insertions(+), 29 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index a425d507f7b..4196608939a 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -282,18 +282,30 @@ class SalesInvoice(SellingController): def before_print(self, settings=None): from frappe.contacts.doctype.address.address import get_address_display_list - company_logo = frappe.get_value("Company", self.company, ["company_logo"]) + company_details = frappe.get_value( + "Company", self.company, ["company_logo", "website", "phone_no", "email"], as_dict=True + ) + address_display_list = get_address_display_list("Company", self.company) + address_line = address_display_list[0] if address_display_list else "" - address_line = "" - if address_display_list and len(address_display_list) > 0: - address_line = address_display_list[0]["address_line1"] + required_fields = [ + company_details.get("company_logo"), + company_details.get("website"), + company_details.get("phone_no"), + company_details.get("email"), + self.company_address, + address_line, + ] - if not address_line or not company_logo or not self.company_address: + if not all(required_fields): frappe.publish_realtime( "sales_invoice_before_print", { - "company_logo": company_logo, + "company_logo": company_details.get("company_logo"), + "website": company_details.get("website"), + "phone_no": company_details.get("phone_no"), + "email": company_details.get("email"), "address_line": address_line, "company": self.company, "company_address_display": self.company_address, @@ -2830,18 +2842,15 @@ def save_company_master_details(name, company, details): if isinstance(details, str): details = frappe.parse_json(details) - if details.get("company_logo"): - frappe.db.set_value( - "Company", - company, - { - "company_logo": details.get("company_logo"), - }, - ) + company_fields = ["company_logo", "website", "phone_no", "email"] + updated_fields = {field: details.get(field) for field in company_fields if details.get(field)} - company_address = None + if updated_fields: + frappe.db.set_value("Company", company, updated_fields) + + company_address = details.get("company_address") if details.get("address_line1"): - address = frappe.get_doc( + address_doc = frappe.get_doc( { "doctype": "Address", "address_title": details.get("address_title"), @@ -2854,11 +2863,9 @@ def save_company_master_details(name, company, details): "is_your_company_address": 1, "links": [{"link_doctype": "Company", "link_name": company}], } - ).insert(ignore_permissions=True) - - company_address = address.name - else: - company_address = details.get("company_address") + ) + address_doc.insert(ignore_permissions=True) + company_address = address_doc.name if company_address: current_display = frappe.db.get_value("Sales Invoice", name, "company_address_display") diff --git a/erpnext/public/js/print.js b/erpnext/public/js/print.js index 20a040f45c4..95f917eb69f 100644 --- a/erpnext/public/js/print.js +++ b/erpnext/public/js/print.js @@ -16,15 +16,33 @@ frappe.realtime.on("sales_invoice_before_print", (data) => { hidden: data.company_logo ? 1 : 0, }, { - label: "Address Title", - fieldname: "address_title", + label: "Website", + fieldname: "website", fieldtype: "Data", - reqd: data.address_line ? 0 : 1, - hidden: data.address_line ? 1 : 0, + reqd: data.website ? 0 : 1, + hidden: data.website ? 1 : 0, }, { - label: "Address Line 1", - fieldname: "address_line1", + label: "Phone No", + fieldname: "phone_no", + fieldtype: "Data", + reqd: data.phone_no ? 0 : 1, + hidden: data.phone_no ? 1 : 0, + }, + { + label: "Email", + fieldname: "email", + fieldtype: "Data", + reqd: data.email ? 0 : 1, + hidden: data.email ? 1 : 0, + }, + { + fieldname: "section_break_1", + fieldtype: "Section Break", + }, + { + label: "Address Title", + fieldname: "address_title", fieldtype: "Data", reqd: data.address_line ? 0 : 1, hidden: data.address_line ? 1 : 0, @@ -38,6 +56,17 @@ frappe.realtime.on("sales_invoice_before_print", (data) => { reqd: data.address_line ? 0 : 1, hidden: data.address_line ? 1 : 0, }, + { + label: "Address Line", + fieldname: "address_line1", + fieldtype: "Data", + reqd: data.address_line ? 0 : 1, + hidden: data.address_line ? 1 : 0, + }, + { + fieldname: "column_break_1", + fieldtype: "Column Break", + }, { label: "City", fieldname: "city", @@ -78,8 +107,8 @@ frappe.realtime.on("sales_invoice_before_print", (data) => { }, }; }, - reqd: data.address_line ? 1 : 0, - hidden: data.address_line ? 0 : 1, + reqd: data.address_line && !data.company_address ? 1 : 0, + hidden: data.address_line && !data.company_address ? 0 : 1, }, ], primary_action_label: "Save", From e3ca318e93b07dffbb8e02856ad5119f73ff7e7c Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Wed, 1 Oct 2025 15:34:37 +0530 Subject: [PATCH 35/45] fix: small ui changes --- .../letterhead/letterhead_with_background_colour.html | 3 +++ erpnext/public/js/print.js | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/letterhead/letterhead_with_background_colour.html b/erpnext/accounts/letterhead/letterhead_with_background_colour.html index ad949d187e4..cf918ee0f5c 100644 --- a/erpnext/accounts/letterhead/letterhead_with_background_colour.html +++ b/erpnext/accounts/letterhead/letterhead_with_background_colour.html @@ -1,4 +1,7 @@ - -
- - - - - - -
-
-
Customer Name:
-
Bill to:
-
-
-
{{ doc.customer_name }}
-
- {% if doc.customer_address %} - {% set customer_address = frappe.get_doc("Address", doc.customer_address) %} - {{ customer_address.address_line1 or "" }}
- {% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
{% endif %} - {{ customer_address.city or "" }} {{ customer_address.state or "" }} {{ customer_address.pincode or "" }} {{ customer_address.country or "" }}
- {% endif %} -
- -
- 		-
-
Invoice Number:
-
-
-
{{ doc.name }}
-
-
-
Invoice Date:
-
-
-
{{ frappe.utils.format_date(doc.posting_date) }}
-
-
-
Payment Due Date:
-
-
-
{{ frappe.utils.format_date(doc.due_date) }}
-
-
- - - {% set item_naming_by = frappe.db.get_single_value("Stock Settings", "item_naming_by") %} - - - - - - {% if item_naming_by != "Item Code" %} - - {% endif %} - - - - - - - {% for item in doc.items %} - - - - {% if item_naming_by != "Item Code" %} - - {% endif %} - - - - - - {% endfor %} - -
{{ _("No") }}{{ _("Item") }}{{ _("Item Code") }}{{ _("Quantity") }}{{ _("Rate") }}{{ _("Amount") }}
{{ loop.index }} - - - {% if item.image %} - - {% endif %} - - -
- {{ item.item_name }} - - {{ item.item_name }} -
- 		{{ item.item_code }}{{ item.get_formatted("qty", 0) }} {{ item.uom }}{{ item.get_formatted("net_rate", doc) }}{{ item.get_formatted("net_amount", doc) }}
- -
- - - - - - - {%- if doc.apply_discount_on == "Net Total" -%} - - - - - {%- endif -%} - {%- for tax in doc.taxes -%} - {%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%} - - - - - {%- endif -%} - {%- endfor -%} - {%- if doc.apply_discount_on == "Grand Total" -%} - - - - - {%- endif -%} -
{{ _("Sub Total:") }}{{ doc.get_formatted("total", doc) }}
- {{ _("Discount") }} ({{ doc.additional_discount_percentage }}%): - {{ doc.get_formatted("discount_amount", doc) }}
{{ tax.get_formatted("description") }} ({{ tax.get_formatted("rate") }}%):{{ tax.get_formatted("tax_amount") }}
- {{ _("Discount") }} ({{ doc.additional_discount_percentage }}%): - {{ doc.get_formatted("discount_amount", doc) }}
-
- -
- - - - - - -
-
- {{ _("In Words: ") }}{{ doc.in_words }} -
- 		{{ _("Grand Total:") }} - - {{ doc.get_formatted("grand_total", doc) }} - -
-
- - - - {% if doc.terms %} -
-
{{ _("Terms and Conditions") }}
- {{ doc.terms}} -
- {% endif %} -
-
-{% endfor %} diff --git a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.json b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.json deleted file mode 100644 index 9952485cc28..00000000000 --- a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "absolute_value": 0, - "align_labels_right": 0, - "creation": "2025-09-15 16:31:00.732539", - "custom_format": 0, - "default_print_language": "en", - "disabled": 0, - "doc_type": "Sales Invoice", - "docstatus": 0, - "doctype": "Print Format", - "font_size": 14, - "idx": 0, - "line_breaks": 0, - "margin_bottom": 15.0, - "margin_left": 15.0, - "margin_right": 15.0, - "margin_top": 15.0, - "modified": "2025-09-15 16:31:00.732539", - "modified_by": "Administrator", - "module": "Accounts", - "name": "Print Format Sales Invoice", - "owner": "Administrator", - "page_number": "Hide", - "pdf_generator": "wkhtmltopdf", - "print_format_builder": 0, - "print_format_builder_beta": 0, - "print_format_for": "DocType", - "print_format_type": "Jinja", - "raw_printing": 0, - "show_section_headings": 0, - "standard": "Yes" -} diff --git a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html deleted file mode 100644 index e11d8c97d69..00000000000 --- a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html +++ /dev/null @@ -1,328 +0,0 @@ -{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, -print_heading_template=None) -%} -{% if letter_head and not no_letterhead %} -
{{ letter_head }}
-{% endif %} -{% if print_heading_template %} - {{ frappe.render_template(print_heading_template, {"doc":doc}) }} -{% else %} -{% endif %} -{%- if doc.meta.is_submittable and doc.docstatus==2-%} -
-

{{ _("CANCELLED") }}

-
-{%- endif -%} -{%- endmacro -%} {% for page in layout %} -
-
- {{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }} -
- - -
- - - - - - - - - - - - - -
- {{ _("Customer Name") }}: {{doc.customer_name }} - - {{ _("Payment Due Date") }}: {{ - frappe.utils.format_date(doc.due_date) }} -
{{ _("Invoice Number") }}: {{ doc.name }} - {{ _("Invoice Date") }}: {{ - frappe.utils.format_date(doc.posting_date) }} -
{{ _("Bill From") }}:
- {% if doc.customer_address %} - {% set customer_address = frappe.get_doc("Address", doc.customer_address) %} - {{ doc.customer_name }}
- {{ customer_address.address_line1 or "" }}
- {% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
{% endif %} - {{ customer_address.city or "" }} {{ customer_address.state or "" }} {{ customer_address.pincode or "" }} {{ customer_address.country or "" }}
- {% endif %} - 		{{ _("Bill To") }}:
- {% if doc.company_address %} - {% set company_address_display = frappe.get_doc("Address", doc.company_address) %} - {{ doc.company }}
- {{ company_address_display.address_line1 or "" }}
- {% if company_address_display.address_line2 %}{{ company_address_display.address_line2 }}
{% endif %} - {{ company_address_display.city or "" }} {{ company_address_display.state or "" }} {{ company_address_display.pincode or "" }} {{ company_address_display.country or "" }}
- {% endif %} -
- - - {% set item_naming_by = frappe.db.get_single_value("Stock Settings", "item_naming_by") %} - - - - - - {% if item_naming_by != "Item Code" %} - - {% endif %} - - - - - - - {% for item in doc.items %} - - - - {% if item_naming_by != "Item Code" %} - - {% endif %} - - - - - {% endfor %} - -
{{ _("No") }}{{ _("Item") }}{{ _("Item Code") }}{{ _("Quantity") }}{{ _("Rate") }}{{ _("Amount") }}
{{ loop.index }}{{ item.item_name }}{{ item.item_code }}{{ item.get_formatted("qty", 0) }} {{ item.uom }}{{ item.get_formatted("net_rate", doc) }} - {{ item.get_formatted("net_amount", doc) }} -
- - - - - - -
-

{{ _("Total in words") }}

-
{{ doc.in_words }}
- 		-   - - - - - - - {%- if doc.apply_discount_on == "Net Total" -%} - - - - - {%- endif -%} - {%- for tax in doc.taxes -%} - {%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%} - - - - - {%- endif -%} - {%- endfor -%} - {%- if doc.apply_discount_on == "Grand Total" -%} - - - - - {%- endif -%} - - - - -
{{ _("Sub Total:") }}		{{ doc.get_formatted("total", doc) }}
-
{{ _("Discount") }} ({{ doc.additional_discount_percentage }}%): - 		{{ doc.get_formatted("discount_amount", doc) }}
{{ tax.get_formatted("description") }} ({{ tax.get_formatted("rate") }}%):		{{ tax.get_formatted("tax_amount") }}
-
{{ _("Discount") }} ({{ doc.additional_discount_percentage }}%): - 		{{ doc.get_formatted("discount_amount", doc) }}
{{ _("Grand Total:") }}{{ doc.get_formatted("grand_total", doc) }}
-
- - -
- {% if doc.terms %} -
-
{{ _("Terms and Conditions") }}
- {{ doc.terms}} -
- {% endif %} -
-
-{% endfor %} diff --git a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.json b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.json deleted file mode 100644 index 39f299ea206..00000000000 --- a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "absolute_value": 0, - "align_labels_right": 0, - "creation": "2025-08-28 04:03:36.284420", - "custom_format": 0, - "default_print_language": "en", - "disabled": 0, - "doc_type": "Sales Invoice", - "docstatus": 0, - "doctype": "Print Format", - "font_size": 14, - "idx": 0, - "line_breaks": 0, - "margin_bottom": 15.0, - "margin_left": 15.0, - "margin_right": 15.0, - "margin_top": 15.0, - "modified": "2025-10-08 22:18:52.241069", - "modified_by": "Administrator", - "module": "Accounts", - "name": "Sales Invoice Print Format", - "owner": "Administrator", - "page_number": "Hide", - "pdf_generator": "wkhtmltopdf", - "print_format_builder": 0, - "print_format_builder_beta": 0, - "print_format_for": "DocType", - "print_format_type": "Jinja", - "raw_printing": 0, - "show_section_headings": 0, - "standard": "Yes" -} diff --git a/erpnext/accounts/print_format/print_format_sales_invoice/__init__.py b/erpnext/accounts/print_format/sales_invoice_standard/__init__.py similarity index 100% rename from erpnext/accounts/print_format/print_format_sales_invoice/__init__.py rename to erpnext/accounts/print_format/sales_invoice_standard/__init__.py diff --git a/erpnext/accounts/print_format/sales_invoice_standard/sales_invoice_standard.json b/erpnext/accounts/print_format/sales_invoice_standard/sales_invoice_standard.json new file mode 100644 index 00000000000..b9feabd9f73 --- /dev/null +++ b/erpnext/accounts/print_format/sales_invoice_standard/sales_invoice_standard.json @@ -0,0 +1,33 @@ +{ + "absolute_value": 0, + "align_labels_right": 0, + "creation": "2025-10-10 02:08:36.763108", + "custom_format": 1, + "default_print_language": "en", + "disabled": 0, + "doc_type": "Sales Invoice", + "docstatus": 0, + "doctype": "Print Format", + "font_size": 14, + "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\t{% if letter_head and not no_letterhead %}\n\t\t
{{ letter_head }}
\n\t{% endif %}\n\t{% if print_heading_template %}\n\t\t{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n\t{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
\n\t
\n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
\n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
\n\t\t\t

{{ _(\"CANCELLED\") }}

\n\t\t
\n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
\n\t\t\t

{{ _(\"DRAFT\") }}

\n\t\t
\n\t{%- endif -%}\n\n\t\n\t
\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t
\n\t\t\t\t\t{{ _(\"Customer Name\") }}: {{doc.customer_name }}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Payment Due Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.due_date) }}\n\t\t\t\t
{{ _(\"Invoice Number\") }}: {{ doc.name }}\n\t\t\t\t\t{{ _(\"Invoice Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.posting_date) }}\n\t\t\t\t
{{ _(\"Bill From\") }}:
\n\t\t\t\t\t{% if doc.customer_address %}\n\t\t\t\t\t\t{% set customer_address = frappe.get_doc(\"Address\", doc.customer_address) %}\n\t\t\t\t\t\t{{ doc.customer_name }}
\n\t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }}
\n\t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
{% endif %}\n\t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }}
\n\t\t\t\t\t{% endif %}\n\t\t\t\t		{{ _(\"Bill To\") }}:
\n\t\t\t\t\t{% if doc.company_address %}\n\t\t\t\t\t\t{% set company_address_display = frappe.get_doc(\"Address\", doc.company_address) %}\n\t\t\t\t\t\t{{ doc.company }}
\n\t\t\t\t\t\t{{ company_address_display.address_line1 or \"\" }}
\n\t\t\t\t\t\t{% if company_address_display.address_line2 %}{{ company_address_display.address_line2 }}
{% endif %}\n\t\t\t\t\t\t{{ company_address_display.city or \"\" }} {{ company_address_display.state or \"\" }} {{ company_address_display.pincode or \"\" }} {{ company_address_display.country or \"\" }}
\n\t\t\t\t\t{% endif %}\n\t\t\t\t
\n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
{{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
{{ loop.index }}{{ item.item_name }}{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}\n\t\t\t\t\t\t{{ item.get_formatted(\"net_amount\", doc) }}\n\t\t\t\t\t
\n\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t
\n\t\t\t\t

{{ _(\"Total in words\") }}

\n\t\t\t\t
{{ doc.in_words }}
\n\t\t\t		\n\t\t\t\t \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- endfor -%}\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
{{ _(\"Sub Total:\") }}		{{ doc.get_formatted(\"total\", doc) }}
\n\t\t\t\t\t\t\t\t
{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t		{{ doc.get_formatted(\"discount_amount\", doc) }}
{{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):		{{ tax.get_formatted(\"tax_amount\") }}
\n\t\t\t\t\t\t\t\t
{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t		{{ doc.get_formatted(\"discount_amount\", doc) }}
{{ _(\"Grand Total:\") }}{{ doc.get_formatted(\"grand_total\", doc) }}
\n\t\t\t
\n\n\t\t\n\t\t
\n\t\t\t{% if doc.terms %}\n\t\t\t
\n\t\t\t\t
{{ _(\"Terms and Conditions\") }}
\n\t\t\t\t{{ doc.terms}}\n\t\t\t
\n\t\t\t{% endif %}\n\t
\n
\n{% endfor %}\n", + "idx": 0, + "line_breaks": 0, + "margin_bottom": 15.0, + "margin_left": 15.0, + "margin_right": 15.0, + "margin_top": 15.0, + "modified": "2025-10-10 12:56:58.584363", + "modified_by": "Administrator", + "module": "Accounts", + "name": "Sales Invoice Standard", + "owner": "Administrator", + "page_number": "Hide", + "pdf_generator": "wkhtmltopdf", + "print_format_builder": 0, + "print_format_builder_beta": 0, + "print_format_for": "DocType", + "print_format_type": "Jinja", + "raw_printing": 0, + "show_section_headings": 0, + "standard": "Yes" +} diff --git a/erpnext/accounts/print_format/sales_invoice_print_format/__init__.py b/erpnext/accounts/print_format/sales_invoice_with_item_image/__init__.py similarity index 100% rename from erpnext/accounts/print_format/sales_invoice_print_format/__init__.py rename to erpnext/accounts/print_format/sales_invoice_with_item_image/__init__.py diff --git a/erpnext/accounts/print_format/sales_invoice_with_item_image/sales_invoice_with_item_image.json b/erpnext/accounts/print_format/sales_invoice_with_item_image/sales_invoice_with_item_image.json new file mode 100644 index 00000000000..bec00d26119 --- /dev/null +++ b/erpnext/accounts/print_format/sales_invoice_with_item_image/sales_invoice_with_item_image.json @@ -0,0 +1,33 @@ +{ + "absolute_value": 0, + "align_labels_right": 0, + "creation": "2025-10-10 02:16:45.078776", + "custom_format": 1, + "default_print_language": "en", + "disabled": 0, + "doc_type": "Sales Invoice", + "docstatus": 0, + "doctype": "Print Format", + "font_size": 14, + "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\n{% if letter_head and not no_letterhead %}\n
{{ letter_head }}
\n{% endif %}\n{% if print_heading_template %}\n{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
\n\t
\n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
\n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
\n\t\t\t

{{ _(\"CANCELLED\") }}

\n\t\t
\n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
\n\t\t\t

{{ _(\"DRAFT\") }}

\n\t\t
\n\t{%- endif -%}\n\n\t\n\n\t
\n\t\t\n\t\t\t\n\t\t\t\t\n\n\t\t\t\t\n\t\t\t\n\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
Customer Name:
\n\t\t\t\t\t\t
Bill to:
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
{{ doc.customer_name }}
\n\t\t\t\t\t\t
\n\t\t\t\t\t\t\t{% if doc.customer_address %}\n\t\t\t\t\t\t\t\t{% set customer_address = frappe.get_doc(\"Address\", doc.customer_address) %}\n\t\t\t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }}
\n\t\t\t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
{% endif %}\n\t\t\t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }}
\n\t\t\t\t\t\t\t{% endif %}\n\t\t\t\t\t\t
\n\n\t\t\t\t\t
\n\t\t\t\t		\n\t\t\t\t\t
\n\t\t\t\t\t\t
Invoice Number:
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
{{ doc.name }}
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
Invoice Date:
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
{{ frappe.utils.format_date(doc.posting_date) }}
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
Payment Due Date:
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
{{ frappe.utils.format_date(doc.due_date) }}
\n\t\t\t\t\t
\n\t\t\t\t
\n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
{{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
{{ loop.index }}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t{% if item.image %}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t{% endif %}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t{{ item.item_name }}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t
\n\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t
\n\t\t\t\t\t		{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}{{ item.get_formatted(\"net_amount\", doc) }}
\n\n\t\t
\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\n\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t{%- endfor -%}\n\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t{%- endif -%}\n\t\t\t
{{ _(\"Sub Total:\") }}{{ doc.get_formatted(\"total\", doc) }}
\n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }}
{{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):{{ tax.get_formatted(\"tax_amount\") }}
\n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }}
\n\t\t
\n\n\t\t
\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t
\n\t\t\t\t\t\t
\n\t\t\t\t\t\t\t {{ _(\"In Words: \") }}{{ doc.in_words }}\n\t\t\t\t\t\t
\n\t\t\t\t\t		{{ _(\"Grand Total:\") }}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t{{ doc.get_formatted(\"grand_total\", doc) }}\n\t\t\t\t\t\t\n\t\t\t\t\t
\n\t\t
\n\n\n\t\t\n\t\t{% if doc.terms %}\n\t\t
\n\t\t\t
{{ _(\"Terms and Conditions\") }}
\n\t\t\t{{ doc.terms}}\n\t\t
\n\t\t{% endif %}\n\t
\n
\n{% endfor %}\n", + "idx": 0, + "line_breaks": 0, + "margin_bottom": 15.0, + "margin_left": 15.0, + "margin_right": 15.0, + "margin_top": 15.0, + "modified": "2025-10-10 02:16:45.078776", + "modified_by": "Administrator", + "module": "Accounts", + "name": "Sales Invoice with Item Image", + "owner": "Administrator", + "page_number": "Hide", + "pdf_generator": "wkhtmltopdf", + "print_format_builder": 0, + "print_format_builder_beta": 0, + "print_format_for": "DocType", + "print_format_type": "Jinja", + "raw_printing": 0, + "show_section_headings": 0, + "standard": "Yes" +} From 33110951b3ae98984553a53be9f5437a897c7fee Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Fri, 10 Oct 2025 18:12:40 +0530 Subject: [PATCH 41/45] refactor: replace get_doc with get_value --- .../doctype/sales_invoice/sales_invoice.py | 10 ++++----- .../accounts/letterhead/letterhead_plain.html | 16 +++++++------- .../letterhead_with_background_colour.html | 21 +++++++++---------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 31d21bc1fe6..120d27d2cd4 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -2857,10 +2857,10 @@ def save_company_master_details(name, company, details): validate_email_address(details.email, throw=True) company_fields = ["company_logo", "website", "phone_no", "email"] - updated_fields = {field: details.get(field) for field in company_fields if details.get(field)} + company_fields_to_update = {field: details.get(field) for field in company_fields if details.get(field)} - if updated_fields: - frappe.db.set_value("Company", company, updated_fields) + if company_fields_to_update: + frappe.db.set_value("Company", company, company_fields_to_update) company_address = details.get("company_address") if details.get("address_line1"): @@ -2883,8 +2883,8 @@ def save_company_master_details(name, company, details): company_address = address_doc.name if company_address: - current_display = frappe.db.get_value("Sales Invoice", name, "company_address_display") - if not current_display or details.get("address_line1"): + company_address_display = frappe.db.get_value("Sales Invoice", name, "company_address_display") + if not company_address_display or details.get("address_line1"): frappe.db.set_value( "Sales Invoice", name, diff --git a/erpnext/accounts/letterhead/letterhead_plain.html b/erpnext/accounts/letterhead/letterhead_plain.html index 46613a31308..8fbf58ec68f 100644 --- a/erpnext/accounts/letterhead/letterhead_plain.html +++ b/erpnext/accounts/letterhead/letterhead_plain.html @@ -69,17 +69,19 @@ {{ doc.company }}
{% if doc.company_address %} - {% set company_address_display = frappe.get_doc("Address", doc.company_address) %} - {{ company_address_display.address_line1 or "" }}
- {% if company_address_display.address_line2 %}{{ company_address_display.address_line2 }}
{% endif %} - {{ company_address_display.city or "" }}, {{ company_address_display.state or "" }} {{ company_address_display.pincode or "" }}, {{ company_address_display.country or "" }}
+ {% set company_address = frappe.db.get_value("Address", doc.company_address, ["address_line1", "address_line2", "city", "state", "pincode", "country"], as_dict=True) %} + + {{ company_address.get("address_line1") or "" }}
+ {% if company_address.get("address_line2") %}{{ company_address.get("address_line2") }}
{% endif %} + {{ company_address.get("city") or "" }}, {{ company_address.get("state") or "" }} {{ company_address.get("pincode") or "" }}, {{ company_address.get("country") or "" }}
{% endif %} - {% set website = frappe.db.get_value("Company", doc.company, "website") %} - {% set email = frappe.db.get_value("Company", doc.company, "email") %} - {% set phone_no = frappe.db.get_value("Company", doc.company, "phone_no") %} + {% set company_details = frappe.db.get_value("Company", doc.company, ["website", "email", "phone_no"], as_dict=True) %} + {% set website = company_details.website %} + {% set email = company_details.email %} + {% set phone_no = company_details.phone_no %}
{{ _("Invoice:") }} diff --git a/erpnext/accounts/letterhead/letterhead_with_background_colour.html b/erpnext/accounts/letterhead/letterhead_with_background_colour.html index 9e2ca5033a4..425a81ff081 100644 --- a/erpnext/accounts/letterhead/letterhead_with_background_colour.html +++ b/erpnext/accounts/letterhead/letterhead_with_background_colour.html @@ -22,13 +22,13 @@ vertical-align: top; } - .logo { + .letter-head .logo { width: 90px; display: block; margin-bottom: 10px; } - .logo img { + .letter-head .logo img { border-radius: 15px; } @@ -82,12 +82,12 @@ {% endif %}
{{ doc.company }}
- {% if doc.company_address %} {% set company_address_display = frappe.get_doc("Address", - doc.company_address) %} {{ company_address_display.address_line1 or "" }}
{% if - company_address_display.address_line2 %}{{ company_address_display.address_line2 }}
{% - endif %} {{ company_address_display.city or "" }}, {{ company_address_display.state or "" - }} {{ company_address_display.pincode or "" }}, {{ company_address_display.country or "" - }}
+ {% if doc.company_address %} + {% set company_address = frappe.db.get_value("Address", doc.company_address, ["address_line1", "address_line2", "city", "state", "pincode", "country"], as_dict=True) %} + {{ company_address.address_line1 or "" }}
+ {% if company_address.address_line2 %} {{ company_address.address_line2 }}
{% endif %} + {{ company_address.city or "" }}, {{ company_address.state or "" }} + {{ company_address.pincode or "" }}, {{ company_address.country or ""}}
{% endif %}
@@ -99,9 +99,8 @@
- {% set website = frappe.db.get_value("Company", doc.company, "website") %} {% set email = - frappe.db.get_value("Company", doc.company, "email") %} {% set phone_no = - frappe.db.get_value("Company", doc.company, "phone_no") %} {% if website %} + {% set company_details = frappe.db.get_value("Company", doc.company, ["website", "email", "phone_no"], as_dict=True) %} + {% set website = company_details.website %} {% set email = company_details.email %} {% set phone_no = company_details.phone_no %} {% if website %}
{{ _("Website:") }}{{ website }} From 533257c4f36bed502b5a2f2c71b04e1c0b951c93 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Fri, 10 Oct 2025 22:30:30 +0530 Subject: [PATCH 42/45] refactor: use get_value to improve performance --- .../sales_invoice_standard/sales_invoice_standard.json | 4 ++-- .../sales_invoice_with_item_image.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/print_format/sales_invoice_standard/sales_invoice_standard.json b/erpnext/accounts/print_format/sales_invoice_standard/sales_invoice_standard.json index b9feabd9f73..42031d7dce5 100644 --- a/erpnext/accounts/print_format/sales_invoice_standard/sales_invoice_standard.json +++ b/erpnext/accounts/print_format/sales_invoice_standard/sales_invoice_standard.json @@ -9,14 +9,14 @@ "docstatus": 0, "doctype": "Print Format", "font_size": 14, - "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\t{% if letter_head and not no_letterhead %}\n\t\t
{{ letter_head }}
\n\t{% endif %}\n\t{% if print_heading_template %}\n\t\t{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n\t{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
\n\t
\n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
\n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
\n\t\t\t

{{ _(\"CANCELLED\") }}

\n\t\t
\n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
\n\t\t\t

{{ _(\"DRAFT\") }}

\n\t\t
\n\t{%- endif -%}\n\n\t\n\t
\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t
\n\t\t\t\t\t{{ _(\"Customer Name\") }}: {{doc.customer_name }}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Payment Due Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.due_date) }}\n\t\t\t\t
{{ _(\"Invoice Number\") }}: {{ doc.name }}\n\t\t\t\t\t{{ _(\"Invoice Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.posting_date) }}\n\t\t\t\t
{{ _(\"Bill From\") }}:
\n\t\t\t\t\t{% if doc.customer_address %}\n\t\t\t\t\t\t{% set customer_address = frappe.get_doc(\"Address\", doc.customer_address) %}\n\t\t\t\t\t\t{{ doc.customer_name }}
\n\t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }}
\n\t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
{% endif %}\n\t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }}
\n\t\t\t\t\t{% endif %}\n\t\t\t\t		{{ _(\"Bill To\") }}:
\n\t\t\t\t\t{% if doc.company_address %}\n\t\t\t\t\t\t{% set company_address_display = frappe.get_doc(\"Address\", doc.company_address) %}\n\t\t\t\t\t\t{{ doc.company }}
\n\t\t\t\t\t\t{{ company_address_display.address_line1 or \"\" }}
\n\t\t\t\t\t\t{% if company_address_display.address_line2 %}{{ company_address_display.address_line2 }}
{% endif %}\n\t\t\t\t\t\t{{ company_address_display.city or \"\" }} {{ company_address_display.state or \"\" }} {{ company_address_display.pincode or \"\" }} {{ company_address_display.country or \"\" }}
\n\t\t\t\t\t{% endif %}\n\t\t\t\t
\n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
{{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
{{ loop.index }}{{ item.item_name }}{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}\n\t\t\t\t\t\t{{ item.get_formatted(\"net_amount\", doc) }}\n\t\t\t\t\t
\n\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t
\n\t\t\t\t

{{ _(\"Total in words\") }}

\n\t\t\t\t
{{ doc.in_words }}
\n\t\t\t		\n\t\t\t\t \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- endfor -%}\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
{{ _(\"Sub Total:\") }}		{{ doc.get_formatted(\"total\", doc) }}
\n\t\t\t\t\t\t\t\t
{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t		{{ doc.get_formatted(\"discount_amount\", doc) }}
{{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):		{{ tax.get_formatted(\"tax_amount\") }}
\n\t\t\t\t\t\t\t\t
{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t		{{ doc.get_formatted(\"discount_amount\", doc) }}
{{ _(\"Grand Total:\") }}{{ doc.get_formatted(\"grand_total\", doc) }}
\n\t\t\t
\n\n\t\t\n\t\t
\n\t\t\t{% if doc.terms %}\n\t\t\t
\n\t\t\t\t
{{ _(\"Terms and Conditions\") }}
\n\t\t\t\t{{ doc.terms}}\n\t\t\t
\n\t\t\t{% endif %}\n\t
\n
\n{% endfor %}\n", + "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\t{% if letter_head and not no_letterhead %}\n\t\t
{{ letter_head }}
\n\t{% endif %}\n\t{% if print_heading_template %}\n\t\t{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n\t{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
\n\t
\n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
\n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
\n\t\t\t

{{ _(\"CANCELLED\") }}

\n\t\t
\n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
\n\t\t\t

{{ _(\"DRAFT\") }}

\n\t\t
\n\t{%- endif -%}\n\n\t\n\t
\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t
\n\t\t\t\t\t{{ _(\"Customer Name\") }}: {{doc.customer_name }}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Payment Due Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.due_date) }}\n\t\t\t\t
{{ _(\"Invoice Number\") }}: {{ doc.name }}\n\t\t\t\t\t{{ _(\"Invoice Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.posting_date) }}\n\t\t\t\t
{{ _(\"Bill From\") }}:
\n\t\t\t\t\t{% if doc.customer_address %}\n\t\t\t\t\t\t{% set customer_address = frappe.db.get_value(\"Address\", doc.customer_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.customer_name }}
\n\t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }}
\n\t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
{% endif %}\n\t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }}
\n\t\t\t\t\t{% endif %}\n\t\t\t\t		{{ _(\"Bill To\") }}:
\n\t\t\t\t\t{% if doc.company_address %}\n {% set company_address = frappe.db.get_value(\"Address\", doc.company_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.company }}
\n {{ company_address.get(\"address_line1\") or \"\" }}
\n {% if company_address.get(\"address_line2\") %}{{ company_address.get(\"address_line2\") }}
{% endif %}\n {{ company_address.get(\"city\") or \"\" }}, {{ company_address.get(\"state\") or \"\" }} {{ company_address.get(\"pincode\") or \"\" }}, {{ company_address.get(\"country\") or \"\" }}
\n {% endif %}\n\t\t\t\t
\n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
{{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
{{ loop.index }}{{ item.item_name }}{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}\n\t\t\t\t\t\t{{ item.get_formatted(\"net_amount\", doc) }}\n\t\t\t\t\t
\n\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t
\n\t\t\t\t

{{ _(\"Total in words\") }}

\n\t\t\t\t
{{ doc.in_words }}
\n\t\t\t		\n\t\t\t\t \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- endfor -%}\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
{{ _(\"Sub Total:\") }}		{{ doc.get_formatted(\"total\", doc) }}
\n\t\t\t\t\t\t\t\t
{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t		{{ doc.get_formatted(\"discount_amount\", doc) }}
{{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):		{{ tax.get_formatted(\"tax_amount\") }}
\n\t\t\t\t\t\t\t\t
{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t		{{ doc.get_formatted(\"discount_amount\", doc) }}
{{ _(\"Grand Total:\") }}{{ doc.get_formatted(\"grand_total\", doc) }}
\n\t\t\t
\n\n\t\t\n\t\t
\n\t\t\t{% if doc.terms %}\n\t\t\t
\n\t\t\t\t
{{ _(\"Terms and Conditions\") }}
\n\t\t\t\t{{ doc.terms}}\n\t\t\t
\n\t\t\t{% endif %}\n\t
\n
\n{% endfor %}\n", "idx": 0, "line_breaks": 0, "margin_bottom": 15.0, "margin_left": 15.0, "margin_right": 15.0, "margin_top": 15.0, - "modified": "2025-10-10 12:56:58.584363", + "modified": "2025-10-10 18:30:16.740071", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice Standard", diff --git a/erpnext/accounts/print_format/sales_invoice_with_item_image/sales_invoice_with_item_image.json b/erpnext/accounts/print_format/sales_invoice_with_item_image/sales_invoice_with_item_image.json index bec00d26119..1d3b4dac309 100644 --- a/erpnext/accounts/print_format/sales_invoice_with_item_image/sales_invoice_with_item_image.json +++ b/erpnext/accounts/print_format/sales_invoice_with_item_image/sales_invoice_with_item_image.json @@ -9,14 +9,14 @@ "docstatus": 0, "doctype": "Print Format", "font_size": 14, - "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\n{% if letter_head and not no_letterhead %}\n
{{ letter_head }}
\n{% endif %}\n{% if print_heading_template %}\n{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
\n\t
\n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
\n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
\n\t\t\t

{{ _(\"CANCELLED\") }}

\n\t\t
\n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
\n\t\t\t

{{ _(\"DRAFT\") }}

\n\t\t
\n\t{%- endif -%}\n\n\t\n\n\t
\n\t\t\n\t\t\t\n\t\t\t\t\n\n\t\t\t\t\n\t\t\t\n\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
Customer Name:
\n\t\t\t\t\t\t
Bill to:
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
{{ doc.customer_name }}
\n\t\t\t\t\t\t
\n\t\t\t\t\t\t\t{% if doc.customer_address %}\n\t\t\t\t\t\t\t\t{% set customer_address = frappe.get_doc(\"Address\", doc.customer_address) %}\n\t\t\t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }}
\n\t\t\t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
{% endif %}\n\t\t\t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }}
\n\t\t\t\t\t\t\t{% endif %}\n\t\t\t\t\t\t
\n\n\t\t\t\t\t
\n\t\t\t\t		\n\t\t\t\t\t
\n\t\t\t\t\t\t
Invoice Number:
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
{{ doc.name }}
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
Invoice Date:
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
{{ frappe.utils.format_date(doc.posting_date) }}
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
Payment Due Date:
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
{{ frappe.utils.format_date(doc.due_date) }}
\n\t\t\t\t\t
\n\t\t\t\t
\n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
{{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
{{ loop.index }}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t{% if item.image %}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t{% endif %}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t{{ item.item_name }}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t
\n\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t
\n\t\t\t\t\t		{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}{{ item.get_formatted(\"net_amount\", doc) }}
\n\n\t\t
\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\n\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t{%- endfor -%}\n\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t{%- endif -%}\n\t\t\t
{{ _(\"Sub Total:\") }}{{ doc.get_formatted(\"total\", doc) }}
\n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }}
{{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):{{ tax.get_formatted(\"tax_amount\") }}
\n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }}
\n\t\t
\n\n\t\t
\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t
\n\t\t\t\t\t\t
\n\t\t\t\t\t\t\t {{ _(\"In Words: \") }}{{ doc.in_words }}\n\t\t\t\t\t\t
\n\t\t\t\t\t		{{ _(\"Grand Total:\") }}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t{{ doc.get_formatted(\"grand_total\", doc) }}\n\t\t\t\t\t\t\n\t\t\t\t\t
\n\t\t
\n\n\n\t\t\n\t\t{% if doc.terms %}\n\t\t
\n\t\t\t
{{ _(\"Terms and Conditions\") }}
\n\t\t\t{{ doc.terms}}\n\t\t
\n\t\t{% endif %}\n\t
\n
\n{% endfor %}\n", + "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\n{% if letter_head and not no_letterhead %}\n
{{ letter_head }}
\n{% endif %}\n{% if print_heading_template %}\n{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
\n\t
\n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
\n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
\n\t\t\t

{{ _(\"CANCELLED\") }}

\n\t\t
\n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
\n\t\t\t

{{ _(\"DRAFT\") }}

\n\t\t
\n\t{%- endif -%}\n\n\t\n\n\t
\n\t\t\n\t\t\t\n\t\t\t\t\n\n\t\t\t\t\n\t\t\t\n\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
Customer Name:
\n\t\t\t\t\t\t
Bill to:
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
{{ doc.customer_name }}
\n\t\t\t\t\t\t
\n \t\t\t\t\t{% if doc.customer_address %}\n \t\t\t\t\t\t{% set customer_address = frappe.db.get_value(\"Address\", doc.customer_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n \t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }}
\n \t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
{% endif %}\n \t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }}
\n \t\t\t\t\t{% endif %}\n\t\t\t\t\t\t
\n\n\t\t\t\t\t
\n\t\t\t\t		\n\t\t\t\t\t
\n\t\t\t\t\t\t
Invoice Number:
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
{{ doc.name }}
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
Invoice Date:
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
{{ frappe.utils.format_date(doc.posting_date) }}
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
Payment Due Date:
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
{{ frappe.utils.format_date(doc.due_date) }}
\n\t\t\t\t\t
\n\t\t\t\t
\n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
{{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
{{ loop.index }}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t{% if item.image %}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t{% endif %}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t{{ item.item_name }}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t
\n\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t
\n\t\t\t\t\t		{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}{{ item.get_formatted(\"net_amount\", doc) }}
\n\n\t\t
\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\n\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t{%- endfor -%}\n\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t{%- endif -%}\n\t\t\t
{{ _(\"Sub Total:\") }}{{ doc.get_formatted(\"total\", doc) }}
\n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }}
{{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):{{ tax.get_formatted(\"tax_amount\") }}
\n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }}
\n\t\t
\n\n\t\t
\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t
\n\t\t\t\t\t\t
\n\t\t\t\t\t\t\t {{ _(\"In Words: \") }}{{ doc.in_words }}\n\t\t\t\t\t\t
\n\t\t\t\t\t		{{ _(\"Grand Total:\") }}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t{{ doc.get_formatted(\"grand_total\", doc) }}\n\t\t\t\t\t\t\n\t\t\t\t\t
\n\t\t
\n\n\n\t\t\n\t\t{% if doc.terms %}\n\t\t
\n\t\t\t
{{ _(\"Terms and Conditions\") }}
\n\t\t\t{{ doc.terms}}\n\t\t
\n\t\t{% endif %}\n\t
\n
\n{% endfor %}\n", "idx": 0, "line_breaks": 0, "margin_bottom": 15.0, "margin_left": 15.0, "margin_right": 15.0, "margin_top": 15.0, - "modified": "2025-10-10 02:16:45.078776", + "modified": "2025-10-10 18:20:55.546151", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice with Item Image", From a4fe0fb809867762be4ea364ec7cb410ca9d8744 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Sat, 11 Oct 2025 11:23:56 +0530 Subject: [PATCH 43/45] refactor: use query builder to set company address --- .../doctype/sales_invoice/sales_invoice.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 120d27d2cd4..8608cea9d21 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -2885,14 +2885,16 @@ def save_company_master_details(name, company, details): if company_address: company_address_display = frappe.db.get_value("Sales Invoice", name, "company_address_display") if not company_address_display or details.get("address_line1"): - frappe.db.set_value( - "Sales Invoice", - name, - { - "company_address": company_address, - "company_address_display": get_address_display(company_address), - }, - ) + from frappe.query_builder import DocType + + SalesInvoice = DocType("Sales Invoice") + + ( + frappe.qb.update(SalesInvoice) + .set(SalesInvoice.company_address, company_address) + .set(SalesInvoice.company_address_display, get_address_display(company_address)) + .where(SalesInvoice.name == name) + ).run() return True From 6e07aac5b7ec7dd1200d26afa981ac7c86105e0f Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Sun, 12 Oct 2025 13:10:29 +0530 Subject: [PATCH 44/45] fix: add filter query for address field --- erpnext/accounts/doctype/sales_invoice/sales_invoice.py | 2 +- erpnext/public/js/print.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 8608cea9d21..e1ca58c4583 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -2854,7 +2854,7 @@ def save_company_master_details(name, company, details): details = frappe.parse_json(details) if details.get("email"): - validate_email_address(details.email, throw=True) + validate_email_address(details.get("email"), throw=True) company_fields = ["company_logo", "website", "phone_no", "email"] company_fields_to_update = {field: details.get(field) for field in company_fields if details.get(field)} diff --git a/erpnext/public/js/print.js b/erpnext/public/js/print.js index 3949bcb2da9..56bb25b48d7 100644 --- a/erpnext/public/js/print.js +++ b/erpnext/public/js/print.js @@ -104,6 +104,7 @@ frappe.realtime.on("sales_invoice_before_print", (data) => { options: "Address", get_query: function () { return { + query: "frappe.contacts.doctype.address.address.address_query", filters: { link_doctype: "Company", link_name: data.company, From f14b3ed72375ed27ef53d4647066330bcb23a50c Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Sun, 12 Oct 2025 19:22:26 +0530 Subject: [PATCH 45/45] refactor: add permission check and minor fixes --- .../doctype/sales_invoice/sales_invoice.py | 33 ++++++++++++------- ...ead_plain.html => company_letterhead.html} | 15 ++++----- ...lour.html => company_letterhead_grey.html} | 32 +++++++++--------- .../sales_invoice_standard.json | 4 +-- erpnext/setup/install.py | 4 +-- 5 files changed, 48 insertions(+), 40 deletions(-) rename erpnext/accounts/letterhead/{letterhead_plain.html => company_letterhead.html} (88%) rename erpnext/accounts/letterhead/{letterhead_with_background_colour.html => company_letterhead_grey.html} (79%) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index e1ca58c4583..0b312cd6ac2 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -288,26 +288,35 @@ class SalesInvoice(SellingController): "Company", self.company, ["company_logo", "website", "phone_no", "email"], as_dict=True ) - address_display_list = get_address_display_list("Company", self.company) - address_line = address_display_list[0] if address_display_list else "" - required_fields = [ company_details.get("company_logo"), company_details.get("phone_no"), company_details.get("email"), - self.company_address, - address_line, ] - if not all(required_fields): - if not frappe.has_permission("Company", "write", throw=False): - frappe.msgprint( - _( - "Some required Company details are missing. You don't have permission to update them. Please contact your System Manager." - ) + if not all(required_fields) and not frappe.has_permission("Company", "write", throw=False): + frappe.msgprint( + _( + "Some required Company details are missing. You don't have permission to update them. Please contact your System Manager." ) - return + ) + return + if not self.company_address and not frappe.has_permission("Sales Invoice", "write", throw=False): + frappe.msgprint( + _( + "Company Address is missing. You don't have permission to update it. Please contact your System Manager." + ) + ) + return + + address_display_list = get_address_display_list("Company", self.company) + address_line = address_display_list[0].get("address_line1") if address_display_list else "" + + required_fields.append(self.company_address) + required_fields.append(address_line) + + if not all(required_fields): frappe.publish_realtime( "sales_invoice_before_print", { diff --git a/erpnext/accounts/letterhead/letterhead_plain.html b/erpnext/accounts/letterhead/company_letterhead.html similarity index 88% rename from erpnext/accounts/letterhead/letterhead_plain.html rename to erpnext/accounts/letterhead/company_letterhead.html index 8fbf58ec68f..f4b8db863f6 100644 --- a/erpnext/accounts/letterhead/letterhead_plain.html +++ b/erpnext/accounts/letterhead/company_letterhead.html @@ -79,30 +79,27 @@ {% set company_details = frappe.db.get_value("Company", doc.company, ["website", "email", "phone_no"], as_dict=True) %} - {% set website = company_details.website %} - {% set email = company_details.email %} - {% set phone_no = company_details.phone_no %}
{{ _("Invoice:") }} {{ doc.name }}
- {% if website %} + {% if company_details.website %}
{{ _("Website:") }} - {{ website }} + {{ company_details.website }}
{% endif %} - {% if email %} + {% if company_details.email %}
{{ _("Email:") }} - {{ email }} + {{ company_details.email }}
{% endif %} - {% if phone_no %} + {% if company_details.phone_no %}
{{ _("Contact:") }} - {{ phone_no }} + {{ company_details.phone_no }}
{% endif %} diff --git a/erpnext/accounts/letterhead/letterhead_with_background_colour.html b/erpnext/accounts/letterhead/company_letterhead_grey.html similarity index 79% rename from erpnext/accounts/letterhead/letterhead_with_background_colour.html rename to erpnext/accounts/letterhead/company_letterhead_grey.html index 425a81ff081..3736c19084f 100644 --- a/erpnext/accounts/letterhead/letterhead_with_background_colour.html +++ b/erpnext/accounts/letterhead/company_letterhead_grey.html @@ -100,21 +100,23 @@
{% set company_details = frappe.db.get_value("Company", doc.company, ["website", "email", "phone_no"], as_dict=True) %} - {% set website = company_details.website %} {% set email = company_details.email %} {% set phone_no = company_details.phone_no %} {% if website %} -
- {{ _("Website:") }}{{ website }} -
- {% endif %} {% if email %} -
- {{ _("Email:") }}{{ email }} -
- {% endif %} {% if phone_no %} -
- {{ _("Contact:") }}{{ phone_no }} -
+ {% if company_details.website %} +
+ {{ _("Website:") }}{{ company_details.website }} +
+ {% endif %} + {% if company_details.email %} +
+ {{ _("Email:") }}{{ company_details.email }} +
+ {% endif %} + {% if company_details.phone_no %} +
+ {{ _("Contact:") }}{{ company_details.phone_no }} +
{% endif %}
diff --git a/erpnext/accounts/print_format/sales_invoice_standard/sales_invoice_standard.json b/erpnext/accounts/print_format/sales_invoice_standard/sales_invoice_standard.json index 42031d7dce5..f66861078d3 100644 --- a/erpnext/accounts/print_format/sales_invoice_standard/sales_invoice_standard.json +++ b/erpnext/accounts/print_format/sales_invoice_standard/sales_invoice_standard.json @@ -9,14 +9,14 @@ "docstatus": 0, "doctype": "Print Format", "font_size": 14, - "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\t{% if letter_head and not no_letterhead %}\n\t\t
{{ letter_head }}
\n\t{% endif %}\n\t{% if print_heading_template %}\n\t\t{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n\t{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
\n\t
\n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
\n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
\n\t\t\t

{{ _(\"CANCELLED\") }}

\n\t\t
\n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
\n\t\t\t

{{ _(\"DRAFT\") }}

\n\t\t
\n\t{%- endif -%}\n\n\t\n\t
\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t
\n\t\t\t\t\t{{ _(\"Customer Name\") }}: {{doc.customer_name }}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Payment Due Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.due_date) }}\n\t\t\t\t
{{ _(\"Invoice Number\") }}: {{ doc.name }}\n\t\t\t\t\t{{ _(\"Invoice Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.posting_date) }}\n\t\t\t\t
{{ _(\"Bill From\") }}:
\n\t\t\t\t\t{% if doc.customer_address %}\n\t\t\t\t\t\t{% set customer_address = frappe.db.get_value(\"Address\", doc.customer_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.customer_name }}
\n\t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }}
\n\t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
{% endif %}\n\t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }}
\n\t\t\t\t\t{% endif %}\n\t\t\t\t		{{ _(\"Bill To\") }}:
\n\t\t\t\t\t{% if doc.company_address %}\n {% set company_address = frappe.db.get_value(\"Address\", doc.company_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.company }}
\n {{ company_address.get(\"address_line1\") or \"\" }}
\n {% if company_address.get(\"address_line2\") %}{{ company_address.get(\"address_line2\") }}
{% endif %}\n {{ company_address.get(\"city\") or \"\" }}, {{ company_address.get(\"state\") or \"\" }} {{ company_address.get(\"pincode\") or \"\" }}, {{ company_address.get(\"country\") or \"\" }}
\n {% endif %}\n\t\t\t\t
\n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
{{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
{{ loop.index }}{{ item.item_name }}{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}\n\t\t\t\t\t\t{{ item.get_formatted(\"net_amount\", doc) }}\n\t\t\t\t\t
\n\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t
\n\t\t\t\t

{{ _(\"Total in words\") }}

\n\t\t\t\t
{{ doc.in_words }}
\n\t\t\t		\n\t\t\t\t \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- endfor -%}\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
{{ _(\"Sub Total:\") }}		{{ doc.get_formatted(\"total\", doc) }}
\n\t\t\t\t\t\t\t\t
{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t		{{ doc.get_formatted(\"discount_amount\", doc) }}
{{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):		{{ tax.get_formatted(\"tax_amount\") }}
\n\t\t\t\t\t\t\t\t
{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t		{{ doc.get_formatted(\"discount_amount\", doc) }}
{{ _(\"Grand Total:\") }}{{ doc.get_formatted(\"grand_total\", doc) }}
\n\t\t\t
\n\n\t\t\n\t\t
\n\t\t\t{% if doc.terms %}\n\t\t\t
\n\t\t\t\t
{{ _(\"Terms and Conditions\") }}
\n\t\t\t\t{{ doc.terms}}\n\t\t\t
\n\t\t\t{% endif %}\n\t
\n
\n{% endfor %}\n", + "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\t{% if letter_head and not no_letterhead %}\n\t\t
{{ letter_head }}
\n\t{% endif %}\n\t{% if print_heading_template %}\n\t\t{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n\t{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
\n\t
\n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
\n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
\n\t\t\t

{{ _(\"CANCELLED\") }}

\n\t\t
\n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
\n\t\t\t

{{ _(\"DRAFT\") }}

\n\t\t
\n\t{%- endif -%}\n\n\t\n\t
\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t
\n\t\t\t\t\t{{ _(\"Customer Name\") }}: {{doc.customer_name }}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Payment Due Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.due_date) }}\n\t\t\t\t
{{ _(\"Invoice Number\") }}: {{ doc.name }}\n\t\t\t\t\t{{ _(\"Invoice Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.posting_date) }}\n\t\t\t\t
{{ _(\"Bill From\") }}:
\n\t\t\t\t\t{% if doc.company_address %}\n {% set company_address = frappe.db.get_value(\"Address\", doc.company_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.company }}
\n {{ company_address.get(\"address_line1\") or \"\" }}
\n {% if company_address.get(\"address_line2\") %}{{ company_address.get(\"address_line2\") }}
{% endif %}\n {{ company_address.get(\"city\") or \"\" }}, {{ company_address.get(\"state\") or \"\" }} {{ company_address.get(\"pincode\") or \"\" }}, {{ company_address.get(\"country\") or \"\" }}
\n {% endif %}\n\t\t\t\t		{{ _(\"Bill To\") }}:
\n\t\t\t\t {% if doc.customer_address %}\n\t\t\t\t\t\t{% set customer_address = frappe.db.get_value(\"Address\", doc.customer_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.customer_name }}
\n\t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }}
\n\t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
{% endif %}\n\t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }}
\n\t\t\t\t\t{% endif %}\n\t\t\t\t
\n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
{{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
{{ loop.index }}{{ item.item_name }}{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}\n\t\t\t\t\t\t{{ item.get_formatted(\"net_amount\", doc) }}\n\t\t\t\t\t
\n\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t
\n\t\t\t\t

{{ _(\"Total in words\") }}

\n\t\t\t\t
{{ doc.in_words }}
\n\t\t\t		\n\t\t\t\t \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- endfor -%}\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
{{ _(\"Sub Total:\") }}		{{ doc.get_formatted(\"total\", doc) }}
\n\t\t\t\t\t\t\t\t
{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t		{{ doc.get_formatted(\"discount_amount\", doc) }}
{{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):		{{ tax.get_formatted(\"tax_amount\") }}
\n\t\t\t\t\t\t\t\t
{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t		{{ doc.get_formatted(\"discount_amount\", doc) }}
{{ _(\"Grand Total:\") }}{{ doc.get_formatted(\"grand_total\", doc) }}
\n\t\t\t
\n\n\t\t\n\t\t
\n\t\t\t{% if doc.terms %}\n\t\t\t
\n\t\t\t\t
{{ _(\"Terms and Conditions\") }}
\n\t\t\t\t{{ doc.terms}}\n\t\t\t
\n\t\t\t{% endif %}\n\t
\n
\n{% endfor %}\n", "idx": 0, "line_breaks": 0, "margin_bottom": 15.0, "margin_left": 15.0, "margin_right": 15.0, "margin_top": 15.0, - "modified": "2025-10-10 18:30:16.740071", + "modified": "2025-10-12 17:18:38.613066", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice Standard", diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py index 49550d8094d..ab29db3a4c8 100644 --- a/erpnext/setup/install.py +++ b/erpnext/setup/install.py @@ -286,8 +286,8 @@ def create_letter_head(): base_path = frappe.get_app_path("erpnext", "accounts", "letterhead") letterheads = { - "Letterhead with background colour": "letterhead_with_background_colour.html", - "Letterhead Plain": "letterhead_plain.html", + "Company Letterhead": "company_letterhead.html", + "Company Letterhead - Grey": "company_letterhead_grey.html", } for name, filename in letterheads.items():