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 %}