From 7899619ab44febba764e8ffc269299103221d626 Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Tue, 11 Oct 2022 17:10:38 +0530 Subject: [PATCH] feat: mention tax invoice on print --- schemas/app/PrintSettings.json | 6 ++ .../SalesInvoice/Templates/BaseTemplate.vue | 1 + .../SalesInvoice/Templates/Basic.vue | 6 ++ .../SalesInvoice/Templates/Business.vue | 6 ++ .../SalesInvoice/Templates/Minimal.vue | 61 ++++++++++++------- 5 files changed, 59 insertions(+), 21 deletions(-) diff --git a/schemas/app/PrintSettings.json b/schemas/app/PrintSettings.json index 53e95871..ed88843e 100644 --- a/schemas/app/PrintSettings.json +++ b/schemas/app/PrintSettings.json @@ -24,6 +24,11 @@ "label": "Display Logo in Invoice", "fieldtype": "Check" }, + { + "fieldname": "displayTaxInvoice", + "label": "Display Tax Invoice", + "fieldtype": "Check" + }, { "fieldname": "phone", "label": "Phone", @@ -133,6 +138,7 @@ "quickEditFields": [ "logo", "displayLogo", + "displayTaxInvoice", "template", "color", "font", diff --git a/src/components/SalesInvoice/Templates/BaseTemplate.vue b/src/components/SalesInvoice/Templates/BaseTemplate.vue index 6bbef962..ac60ded5 100644 --- a/src/components/SalesInvoice/Templates/BaseTemplate.vue +++ b/src/components/SalesInvoice/Templates/BaseTemplate.vue @@ -82,6 +82,7 @@ export default { color: this.printSettings.color, showHSN: this.showHSN, displayLogo: this.printSettings.displayLogo, + displayTaxInvoice: this.printSettings.displayTaxInvoice, discountAfterTax: this.doc.discountAfterTax, logo: this.printSettings.logo, companyName: this.fyo.singles.AccountingSettings.companyName, diff --git a/src/components/SalesInvoice/Templates/Basic.vue b/src/components/SalesInvoice/Templates/Basic.vue index 6ead0b28..1c93ee0c 100644 --- a/src/components/SalesInvoice/Templates/Basic.vue +++ b/src/components/SalesInvoice/Templates/Basic.vue @@ -5,6 +5,12 @@ >
+

+ {{ t`Tax Invoice` }} +

diff --git a/src/components/SalesInvoice/Templates/Business.vue b/src/components/SalesInvoice/Templates/Business.vue index e4c48b49..c7a4a0a1 100644 --- a/src/components/SalesInvoice/Templates/Business.vue +++ b/src/components/SalesInvoice/Templates/Business.vue @@ -4,6 +4,12 @@ :style="{ 'font-family': printObject.font }" >
+

+ {{ t`Tax Invoice` }} +

diff --git a/src/components/SalesInvoice/Templates/Minimal.vue b/src/components/SalesInvoice/Templates/Minimal.vue index cd54f0c1..eb2a6b5f 100644 --- a/src/components/SalesInvoice/Templates/Minimal.vue +++ b/src/components/SalesInvoice/Templates/Minimal.vue @@ -3,38 +3,57 @@ class="bg-white border h-full" :style="{ 'font-family': printObject.font }" > -
-
-
-
- +
+

+ {{ t`Tax Invoice` }} +

+
+
+
+
+ +
+
+
+
+ {{ printObject.companyName }} +
+
+ {{ printObject.date }} +
-
+
- {{ printObject.companyName }} + {{ + printObject.isSalesInvoice + ? t`Sales Invoice` + : t`Purchase Invoice` + }}
- {{ printObject.date }} + {{ printObject.invoiceName }}
-
-
- {{ - printObject.isSalesInvoice ? t`Sales Invoice` : t`Purchase Invoice` - }} -
-
- {{ printObject.invoiceName }} -
-