From 5c6e91943e6f495b9a5f6442140436ecf765df1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20F=C3=B6rster?= <acc_gitlab@svfo.de>
Date: Tue, 15 Oct 2024 16:25:02 +0200
Subject: [PATCH 1/5] Print format more robust in html and pdf view

---
 print_format/delivery_note.jinja         | 17 ++++--------
 print_format/dunning.jinja               | 17 ++++--------
 print_format/purchase_order.jinja        | 17 ++++--------
 print_format/quotation.jinja             | 17 ++++--------
 print_format/request_for_quotation.jinja | 17 ++++--------
 print_format/sales_invoice.jinja         | 17 ++++--------
 print_format/sales_order.jinja           | 17 ++++--------
 print_style/print_style.scss             | 33 +++++++++++++++++-------
 8 files changed, 59 insertions(+), 93 deletions(-)

diff --git a/print_format/delivery_note.jinja b/print_format/delivery_note.jinja
index 6a0468b..b3dfdab 100644
--- a/print_format/delivery_note.jinja
+++ b/print_format/delivery_note.jinja
@@ -1,13 +1,3 @@
-<style>
-    .print-format {
-        margin-left: 0mm;
-        margin-right: 0mm;
-        margin-top: 10mm;
-        margin-bottom: 45mm;
-        font-size: 10pt;
-    }
-</style>
-
 {% set company = frappe.get_doc("Company", doc.company) %}
 {% set cmp_addr = frappe.get_doc("Address", doc.company_address) if doc.company_address else None %}
 {% set ship_addr = frappe.get_doc("Address", doc.shipping_address_name) if doc.shipping_address_name else None %}
@@ -134,10 +124,13 @@
 <!-- FOOTER -->
 <div id="footer-html" class="visible-pdf">
     <div class="letter-head-footer">
-        <p id="pagenum">
+        <p id="pagenum" class="visible-pdf">
             {{ _("Page {0} of {1}").format('<span class="page"></span>', '<span class="topage"></span>') }}
         </p>
-        <div class="print-format-footer">
+        <div class="print-format-footer visible-pdf">
+            {{ footer }}
+        </div>
+        <div class="print-format-footer-html hidden-pdf">
             {{ footer }}
         </div>
     </div>
diff --git a/print_format/dunning.jinja b/print_format/dunning.jinja
index cd42b6b..b304332 100644
--- a/print_format/dunning.jinja
+++ b/print_format/dunning.jinja
@@ -1,13 +1,3 @@
-<style>
-    .print-format {
-        margin-left: 0mm;
-        margin-right: 0mm;
-        margin-top: 10mm;
-        margin-bottom: 45mm;
-        font-size: 10pt;
-    }
-</style>
-
 {% set sales_invoice = frappe.get_doc("Sales Invoice", doc.sales_invoice) %}
 {% set company = frappe.get_doc("Company", doc.company) %}
 {% set cmp_addr = frappe.get_doc("Address", sales_invoice.company_address) if sales_invoice.company_address else None %}
@@ -168,10 +158,13 @@
 <!-- FOOTER -->
 <div id="footer-html" class="visible-pdf">
     <div class="letter-head-footer">
-        <p id="pagenum">
+        <p id="pagenum" class="visible-pdf">
             {{ _("Page {0} of {1}").format('<span class="page"></span>', '<span class="topage"></span>') }}
         </p>
-        <div class="print-format-footer">
+        <div class="print-format-footer visible-pdf">
+            {{ footer }}
+        </div>
+        <div class="print-format-footer-html hidden-pdf">
             {{ footer }}
         </div>
     </div>
diff --git a/print_format/purchase_order.jinja b/print_format/purchase_order.jinja
index 1b72a06..01817d5 100644
--- a/print_format/purchase_order.jinja
+++ b/print_format/purchase_order.jinja
@@ -1,13 +1,3 @@
-<style>
-    .print-format {
-        margin-left: 0mm;
-        margin-right: 0mm;
-        margin-top: 10mm;
-        margin-bottom: 45mm;
-        font-size: 10pt;
-    }
-</style>
-
 {% set company = frappe.get_doc("Company", doc.company) %}
 {% set cmp_addr = frappe.get_doc("Address", doc.billing_address) if doc.billing_address else None %}
 {% set pay_addr = frappe.get_doc("Address", doc.supplier_address) if doc.supplier_address else None %}
@@ -202,10 +192,13 @@
 <!-- FOOTER -->
 <div id="footer-html" class="visible-pdf">
     <div class="letter-head-footer">
-        <p id="pagenum">
+        <p id="pagenum" class="visible-pdf">
             {{ _("Page {0} of {1}").format('<span class="page"></span>', '<span class="topage"></span>') }}
         </p>
-        <div class="print-format-footer">
+        <div class="print-format-footer visible-pdf">
+            {{ footer }}
+        </div>
+        <div class="print-format-footer-html hidden-pdf">
             {{ footer }}
         </div>
     </div>
diff --git a/print_format/quotation.jinja b/print_format/quotation.jinja
index 168592c..874d39d 100644
--- a/print_format/quotation.jinja
+++ b/print_format/quotation.jinja
@@ -1,13 +1,3 @@
-<style>
-    .print-format {
-        margin-left: 0mm;
-        margin-right: 0mm;
-        margin-top: 10mm;
-        margin-bottom: 45mm;
-        font-size: 10pt;
-    }
-</style>
-
 {% set company = frappe.get_doc("Company", doc.company) %}
 {% set cmp_addr = frappe.get_doc("Address", doc.company_address) if  doc.company_address else None %}
 {% set pay_addr = frappe.get_doc("Address", doc.customer_address) if doc.customer_address else None %}
@@ -218,10 +208,13 @@
 <!-- FOOTER -->
 <div id="footer-html" class="visible-pdf">
     <div class="letter-head-footer">
-        <p id="pagenum">
+        <p id="pagenum" class="visible-pdf">
             {{ _("Page {0} of {1}").format('<span class="page"></span>', '<span class="topage"></span>') }}
         </p>
-        <div class="print-format-footer">
+        <div class="print-format-footer visible-pdf">
+            {{ footer }}
+        </div>
+        <div class="print-format-footer-html hidden-pdf">
             {{ footer }}
         </div>
     </div>
diff --git a/print_format/request_for_quotation.jinja b/print_format/request_for_quotation.jinja
index 9161fed..137e49e 100644
--- a/print_format/request_for_quotation.jinja
+++ b/print_format/request_for_quotation.jinja
@@ -1,13 +1,3 @@
-<style>
-    .print-format {
-        margin-left: 0mm;
-        margin-right: 0mm;
-        margin-top: 10mm;
-        margin-bottom: 45mm;
-        font-size: 10pt;
-    }
-</style>
-
 {% set bill_addr = frappe.get_doc("Address", doc.company_address) if doc.company_address else None %}
 {% set company = frappe.get_doc("Company", doc.company) %}
 
@@ -133,10 +123,13 @@
 <!-- FOOTER -->
 <div id="footer-html" class="visible-pdf">
     <div class="letter-head-footer">
-        <p id="pagenum">
+        <p id="pagenum" class="visible-pdf">
             {{ _("Page {0} of {1}").format('<span class="page"></span>', '<span class="topage"></span>') }}
         </p>
-        <div class="print-format-footer">
+        <div class="print-format-footer visible-pdf">
+            {{ footer }}
+        </div>
+        <div class="print-format-footer-html hidden-pdf">
             {{ footer }}
         </div>
     </div>
diff --git a/print_format/sales_invoice.jinja b/print_format/sales_invoice.jinja
index 170ae09..7550a9e 100644
--- a/print_format/sales_invoice.jinja
+++ b/print_format/sales_invoice.jinja
@@ -1,13 +1,3 @@
-<style>
-    .print-format {
-        margin-left: 0mm;
-        margin-right: 0mm;
-        margin-top: 10mm;
-        margin-bottom: 45mm;
-        font-size: 10pt;
-    }
-</style>
-
 {% set company = frappe.get_doc("Company", doc.company) %}
 {% set cmp_addr = frappe.get_doc("Address", doc.company_address) if doc.company_address else None %}
 {% set pay_addr = frappe.get_doc("Address", doc.customer_address) %}
@@ -354,10 +344,13 @@
 <!-- FOOTER -->
 <div id="footer-html" class="visible-pdf">
     <div class="letter-head-footer">
-        <p id="pagenum">
+        <p id="pagenum" class="visible-pdf">
             {{ _("Page {0} of {1}").format('<span class="page"></span>', '<span class="topage"></span>') }}
         </p>
-        <div class="print-format-footer">
+        <div class="print-format-footer visible-pdf">
+            {{ footer }}
+        </div>
+        <div class="print-format-footer-html hidden-pdf">
             {{ footer }}
         </div>
     </div>
diff --git a/print_format/sales_order.jinja b/print_format/sales_order.jinja
index e08ccf1..786da3f 100644
--- a/print_format/sales_order.jinja
+++ b/print_format/sales_order.jinja
@@ -1,13 +1,3 @@
-<style>
-    .print-format {
-        margin-left: 0mm;
-        margin-right: 0mm;
-        margin-top: 10mm;
-        margin-bottom: 45mm;
-        font-size: 10pt;
-    }
-</style>
-
 {% set company = frappe.get_doc("Company", doc.company) %}
 {% set cmp_addr = frappe.get_doc("Address", doc.company_address) if doc.company_address else None %}
 {% set pay_addr = frappe.get_doc("Address", doc.customer_address) %}
@@ -241,10 +231,13 @@
 <!-- FOOTER -->
 <div id="footer-html" class="visible-pdf">
     <div class="letter-head-footer">
-        <p id="pagenum">
+        <p id="pagenum" class="visible-pdf">
             {{ _("Page {0} of {1}").format('<span class="page"></span>', '<span class="topage"></span>') }}
         </p>
-        <div class="print-format-footer">
+        <div class="print-format-footer visible-pdf">
+            {{ footer }}
+        </div>
+        <div class="print-format-footer-html hidden-pdf">
             {{ footer }}
         </div>
     </div>
diff --git a/print_style/print_style.scss b/print_style/print_style.scss
index cff1df6..b3939c0 100644
--- a/print_style/print_style.scss
+++ b/print_style/print_style.scss
@@ -1,17 +1,17 @@
 .print-format {
     padding: 0;
     position: relative;
+    margin-left: 0mm;
+    margin-right: 0mm;
+    margin-top: 10mm;
+    margin-bottom: 45mm;
+    font-size: 10pt;
 
     #header {
-        width: 100%;
         /* ( 45 mm - 10 mm margin ) */
         height: 35mm;
-        /* Overwrite empty header inserted by frappe */
-        margin-top: -10mm;
         overflow: hidden;
         position: relative;
-        margin-left: 25mm;
-        margin-right: 20mm;
     }
 
     .contact-row {
@@ -38,7 +38,7 @@
 
     #address {
         float: left;
-        width: 85mm;
+        width: 80mm;
         padding-left: 5mm;
     }
 
@@ -60,12 +60,13 @@
         height: 1pt;
         background-color: black;
         position: absolute;
+        left: 2mm;
     }
 
     #faltmarke-1 {
         /* ( 105 mm - 10 mm margin ) */
         top: 95mm;
-        width: 12mm;
+        width: 5mm;
     }
 
     #lochmarke {
@@ -77,13 +78,14 @@
     #faltmarke-2 {
         /* ( 210 mm - 10 mm margin ) */
         top: 200mm;
-        width: 12mm;
+        width: 5mm;
     }
 
     #text {
         margin-top: 8.46mm;
         margin-left: 25mm;
         margin-right: 20mm;
+        width: 165mm;
     }
 
     .text-right {
@@ -135,7 +137,18 @@
 
 .print-format-footer {
     margin-left: 25mm;
-    padding-right: 20mm;
+    width: 165mm;
+    margin-right: 20mm;
+}
+
+.print-format-footer-html {
+  margin-left: 25mm;
+  width: 165mm;
+  height: 20mm;
+  margin-right: 20mm;
+  margin-top: -45mm;
+  bottom: 10mm;
+  position: absolute;
 }
 
 #pagenum {
@@ -143,6 +156,8 @@
     margin-right: 20mm;
     margin-top: 4.23mm;
     margin-bottom: 4.23mm;
+    margin-left: 25mm;
+    width: 165mm;
 }
 
 body, html {

From f1865fc53584bb91e282bd5d8015da9ed9aa0ca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20F=C3=B6rster?= <acc_gitlab@svfo.de>
Date: Tue, 15 Oct 2024 16:27:23 +0200
Subject: [PATCH 2/5] config ini in git ignore is more safe to wrong commits.
 provied a example ini

---
 .gitignore                       | 1 +
 config.ini => config.ini.example | 0
 2 files changed, 1 insertion(+)
 rename config.ini => config.ini.example (100%)

diff --git a/.gitignore b/.gitignore
index f38bd75..3a99587 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 print_style.css
 print_style.css.map
 env
+config.ini
diff --git a/config.ini b/config.ini.example
similarity index 100%
rename from config.ini
rename to config.ini.example

From bce8b91d3d3248c87603e8897fa78f0b57a3b725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20F=C3=B6rster?= <acc_gitlab@svfo.de>
Date: Tue, 15 Oct 2024 16:39:35 +0200
Subject: [PATCH 3/5] shows a document status like draft if its not the final
 document

---
 print_format/delivery_note.jinja         | 7 +++++++
 print_format/dunning.jinja               | 7 +++++++
 print_format/purchase_order.jinja        | 7 +++++++
 print_format/quotation.jinja             | 7 +++++++
 print_format/request_for_quotation.jinja | 7 +++++++
 print_format/sales_invoice.jinja         | 7 +++++++
 print_format/sales_order.jinja           | 7 +++++++
 print_style/print_style.scss             | 6 ++++++
 8 files changed, 55 insertions(+)

diff --git a/print_format/delivery_note.jinja b/print_format/delivery_note.jinja
index b3dfdab..36c0dd5 100644
--- a/print_format/delivery_note.jinja
+++ b/print_format/delivery_note.jinja
@@ -61,6 +61,13 @@
 
 <!-- CONTENT -->
 <div id="text">
+    <div class="document-status">
+        {% if doc.docstatus == 0 %}
+        <span style="color: orange; font-weight: bold;">{{ _("Draft") }}</span>
+        {% elif doc.docstatus == 2 %}
+        <span style="color: red; font-weight: bold;">{{ _("Cancelled") }}</span>
+        {% endif %}
+    </div>
 	<div id="subject">
 		<strong>{{ _("Delivery Note") }} {{ doc.name }}</strong>
     </div>
diff --git a/print_format/dunning.jinja b/print_format/dunning.jinja
index b304332..ad3d4f3 100644
--- a/print_format/dunning.jinja
+++ b/print_format/dunning.jinja
@@ -88,6 +88,13 @@
 
 <!-- CONTENT -->
 <div id="text">
+    <div class="document-status">
+        {% if doc.docstatus == 0 %}
+        <span style="color: orange; font-weight: bold;">{{ _("Draft") }}</span>
+        {% elif doc.docstatus == 2 %}
+        <span style="color: red; font-weight: bold;">{{ _("Cancelled") }}</span>
+        {% endif %}
+    </div>
     <div id="subject">
         <strong>{{ doc.dunning_type }}</strong><br>
     </div>
diff --git a/print_format/purchase_order.jinja b/print_format/purchase_order.jinja
index 01817d5..82832f9 100644
--- a/print_format/purchase_order.jinja
+++ b/print_format/purchase_order.jinja
@@ -55,6 +55,13 @@
 
 <!-- CONTENT -->
 <div id="text">
+    <div class="document-status">
+        {% if doc.docstatus == 0 %}
+        <span style="color: orange; font-weight: bold;">{{ _("Draft") }}</span>
+        {% elif doc.docstatus == 2 %}
+        <span style="color: red; font-weight: bold;">{{ _("Cancelled") }}</span>
+        {% endif %}
+    </div>
     <div id="subject">
         <strong>{{ _("Purchase Order") }} {{ doc.name }}</strong>
     </div>
diff --git a/print_format/quotation.jinja b/print_format/quotation.jinja
index 874d39d..b660366 100644
--- a/print_format/quotation.jinja
+++ b/print_format/quotation.jinja
@@ -70,6 +70,13 @@
 
 <!-- CONTENT -->
 <div id="text">
+    <div class="document-status">
+        {% if doc.docstatus == 0 %}
+        <span style="color: orange; font-weight: bold;">{{ _("Draft") }}</span>
+        {% elif doc.docstatus == 2 %}
+        <span style="color: red; font-weight: bold;">{{ _("Cancelled") }}</span>
+        {% endif %}
+    </div>
     <div id="subject">
         <strong>{{ _(doc.doctype) }} {{ doc.name }}</strong>
     </div>
diff --git a/print_format/request_for_quotation.jinja b/print_format/request_for_quotation.jinja
index 137e49e..bd2a4ae 100644
--- a/print_format/request_for_quotation.jinja
+++ b/print_format/request_for_quotation.jinja
@@ -66,6 +66,13 @@
 
 <!-- CONTENT -->
 <div id="text">
+    <div class="document-status">
+        {% if doc.docstatus == 0 %}
+        <span style="color: orange; font-weight: bold;">{{ _("Draft") }}</span>
+        {% elif doc.docstatus == 2 %}
+        <span style="color: red; font-weight: bold;">{{ _("Cancelled") }}</span>
+        {% endif %}
+    </div>
     <div id="subject">
         <strong>{{ _("Request for Quotation") }} {{ doc.name }}</strong>
     </div>
diff --git a/print_format/sales_invoice.jinja b/print_format/sales_invoice.jinja
index 7550a9e..adcca72 100644
--- a/print_format/sales_invoice.jinja
+++ b/print_format/sales_invoice.jinja
@@ -101,6 +101,13 @@
 
 <!-- CONTENT -->
 <div id="text">
+    <div class="document-status">
+        {% if doc.docstatus == 0 %}
+        <span style="color: orange; font-weight: bold;">{{ _("Draft") }}</span>
+        {% elif doc.docstatus == 2 %}
+        <span style="color: red; font-weight: bold;">{{ _("Cancelled") }}</span>
+        {% endif %}
+    </div>
     <div id="subject">
         {% if doc.is_return %}
             <p><strong>{{ _("Correction Invoice") }} {{ doc.name }}</strong></p>
diff --git a/print_format/sales_order.jinja b/print_format/sales_order.jinja
index 786da3f..8bbb265 100644
--- a/print_format/sales_order.jinja
+++ b/print_format/sales_order.jinja
@@ -72,6 +72,13 @@
 
 <!-- CONTENT -->
 <div id="text">
+    <div class="document-status">
+        {% if doc.docstatus == 0 %}
+        <span style="color: orange; font-weight: bold;">{{ _("Draft") }}</span>
+        {% elif doc.docstatus == 2 %}
+        <span style="color: red; font-weight: bold;">{{ _("Cancelled") }}</span>
+        {% endif %}
+    </div>
     <div id="subject">
         <strong>{{ _("Order Confirmation") }} {{ doc.name }}</strong>
     </div>
diff --git a/print_style/print_style.scss b/print_style/print_style.scss
index b3939c0..cea4511 100644
--- a/print_style/print_style.scss
+++ b/print_style/print_style.scss
@@ -52,6 +52,12 @@
         padding: 1.5px !important;
     }
 
+    .document-status {
+      font-size: 14pt;
+      text-align: center;
+      text-transform: uppercase;
+    }
+
     #subject {
         margin-bottom: 2em;
     }

From abb396f4fa4225148e6d22af36db543271341d20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20F=C3=B6rster?= <acc_gitlab@svfo.de>
Date: Tue, 15 Oct 2024 17:07:46 +0200
Subject: [PATCH 4/5] show the bill if no customer address is filled

---
 print_format/sales_invoice.jinja | 2 +-
 print_format/sales_order.jinja   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/print_format/sales_invoice.jinja b/print_format/sales_invoice.jinja
index adcca72..338ff7f 100644
--- a/print_format/sales_invoice.jinja
+++ b/print_format/sales_invoice.jinja
@@ -1,6 +1,6 @@
 {% set company = frappe.get_doc("Company", doc.company) %}
 {% set cmp_addr = frappe.get_doc("Address", doc.company_address) if doc.company_address else None %}
-{% set pay_addr = frappe.get_doc("Address", doc.customer_address) %}
+{% set pay_addr = frappe.get_doc("Address", doc.customer_address) if doc.customer_address else None %}
 
 {% if doc.contact_person %}
     {% set contact = frappe.get_doc("Contact", doc.contact_person) %}
diff --git a/print_format/sales_order.jinja b/print_format/sales_order.jinja
index 8bbb265..26ce6b8 100644
--- a/print_format/sales_order.jinja
+++ b/print_format/sales_order.jinja
@@ -1,6 +1,6 @@
 {% set company = frappe.get_doc("Company", doc.company) %}
 {% set cmp_addr = frappe.get_doc("Address", doc.company_address) if doc.company_address else None %}
-{% set pay_addr = frappe.get_doc("Address", doc.customer_address) %}
+{% set pay_addr = frappe.get_doc("Address", doc.customer_address) if doc.customer_address else None %}
 
 {% if doc.contact_person %}
     {% set contact = frappe.get_doc("Contact", doc.contact_person) %}

From 37bd0bdd2f107d0af31d5bbde4fd797851e23f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20F=C3=B6rster?= <acc_gitlab@svfo.de>
Date: Tue, 15 Oct 2024 18:55:01 +0200
Subject: [PATCH 5/5] added performance period of a timetable is added
 introduced short form of invoice

---
 config.ini.example                       |   4 +
 print_format/sales_invoice.jinja         |  18 +-
 print_format/sales_invoice_compact.jinja | 374 +++++++++++++++++++++++
 3 files changed, 392 insertions(+), 4 deletions(-)
 create mode 100644 print_format/sales_invoice_compact.jinja

diff --git a/config.ini.example b/config.ini.example
index a0eb8fc..33538ca 100644
--- a/config.ini.example
+++ b/config.ini.example
@@ -23,6 +23,10 @@ TemplateFile = print_format/quotation.jinja
 DocType = Sales Invoice
 TemplateFile = print_format/sales_invoice.jinja
 
+[Ausgangsrechnung kompakt]
+DocType = Sales Invoice
+TemplateFile = print_format/sales_invoice_compact.jinja
+
 [Auftragsbestätigung]
 DocType = Sales Order
 TemplateFile = print_format/sales_order.jinja
diff --git a/print_format/sales_invoice.jinja b/print_format/sales_invoice.jinja
index 338ff7f..0c25174 100644
--- a/print_format/sales_invoice.jinja
+++ b/print_format/sales_invoice.jinja
@@ -80,15 +80,25 @@
             {% endif %}
 
             {% if doc.from_date and doc.to_date %}
+                {% set from_date = doc.from_date %}
+                {% set to_date = doc.to_date %}
+            {% endif %}
+            {% set timesheet = frappe.get_doc("Timesheet", doc.timesheets.time_sheet)%}
+            {% if timesheet.start_date and timesheet.end_date %}
+                {% set from_date = timesheet.start_date %}
+                {% set to_date = timesheet.end_date %}
+            {% endif %}
+            
+            {% if from_date and to_date %}
             <tr>
                 <td>{{ _("Performance Period") }}:</td>
                 {# If the year matches (first 4 chars in ISO-string), omit it for from_date #}
-                {% if doc.from_date.year is defined %}
-                    {% set date_format = "dd.mm." if doc.from_date.year == doc.to_date.year else "dd.mm.yy" %}
+                {% if from_date.year is defined %}
+                {% set date_format = "dd.mm." if from_date.year == to_date.year else "dd.mm.yy" %}
                 {% else %}
-                    {% set date_format = "dd.mm." if doc.from_date[:4] == doc.to_date[:4] else "dd.mm.yy" %}
+                {% set date_format = "dd.mm." if from_date[:4] == to_date[:4] else "dd.mm.yy" %}
                 {% endif %}
-                <td class="text-right">{{ frappe.utils.formatdate(doc.from_date, date_format) }} - {{ frappe.utils.formatdate(doc.to_date, "dd.mm.yyyy") }}</td>
+                <td class="text-right">{{ frappe.utils.formatdate(from_date, date_format) }} - {{ frappe.utils.formatdate(to_date, "dd.mm.yyyy") }}</td>
             </tr>
             {% endif %}
         </table>
diff --git a/print_format/sales_invoice_compact.jinja b/print_format/sales_invoice_compact.jinja
new file mode 100644
index 0000000..e5193ab
--- /dev/null
+++ b/print_format/sales_invoice_compact.jinja
@@ -0,0 +1,374 @@
+{% set company = frappe.get_doc("Company", doc.company) %}
+{% set cmp_addr = frappe.get_doc("Address", doc.company_address) if doc.company_address else None %}
+{% set pay_addr = frappe.get_doc("Address", doc.customer_address) if doc.customer_address else None %}
+
+{% if doc.contact_person %}
+{% set contact = frappe.get_doc("Contact", doc.contact_person) %}
+{% endif %}
+
+<!-- HEAD -->
+<div id="header">
+    <div class="letter-head">
+        {{ letter_head }}
+    </div>
+</div>
+
+<div class="contact-row">
+    <div id="address">
+        {% if cmp_addr %}
+        <div id="sender">
+            <p>{{ cmp_addr.address_title }} &#183; {{ cmp_addr.address_line1 }} &#183;
+                {% if cmp_addr.address_line2 %}{{ cmp_addr.address_line2 }} <br>{% endif %}
+                {{ cmp_addr.pincode }} {{ cmp_addr.city }}
+                {% if pay_addr and (cmp_addr.country != pay_addr.country) -%}
+                &#183; {{ cmp_addr.country | upper }}
+                {%- endif %}
+            </p>
+        </div>
+        {% endif %}
+        {{ doc.customer_name }}<br />
+        {% if contact %}
+        {%- if contact.salutation -%}
+        {{ contact.salutation }}
+        {%- endif %}
+        {%- if contact.salutation in ["Hr.", "Herr"] %}n{% endif %}
+        {{ contact.first_name }} {{ contact.last_name }}<br>
+        {% endif %}
+        {{ doc.address_display or "" }}
+    </div>
+
+    <div id="contact">
+        <table class="w-100 text-small">
+            {% if company.phone_no %}
+            <tr>
+                <td>{{ _("Phone") }}:</td>
+                <td class="text-right">{{ company.phone_no }}</td>
+            </tr>
+            {% endif %}
+
+            {% if company.email %}
+            <tr>
+                <td>{{ _("Email") }}:</td>
+                <td class="text-right">{{ company.email }}</td>
+            </tr>
+            {% endif %}
+
+            <tr>
+                <td>{{ _("Date") }}:</td>
+                <td class="text-right">{{ frappe.utils.formatdate(doc.posting_date, "long") }}</td>
+            </tr>
+
+            {% if not doc.is_return %}
+            <tr>
+                <td>{{ _("Payment Due Date") }}:</td>
+                <td class="text-right">{{ frappe.utils.formatdate(doc.due_date, "long") }}</td>
+            </tr>
+            {% endif %}
+
+            {% if doc.po_no %}
+            <tr>
+                <td>{{ _("Your PO No.") }}:</td>
+                <td class="text-right">{{ doc.po_no }}</td>
+            </tr>
+            {% endif %}
+
+            {% if doc.tax_id %}
+            <tr>
+                <td>{{ _("Your Tax ID") }}:</td>
+                <td class="text-right">{{ doc.tax_id }}</td>
+            </tr>
+            {% endif %}
+
+            {% if doc.from_date and doc.to_date %}
+            {% set from_date = doc.from_date %}
+            {% set to_date = doc.to_date %}
+            {% endif %}
+            {% set timesheet = frappe.get_doc("Timesheet", doc.timesheets.time_sheet)%}
+            {% if timesheet.start_date and timesheet.end_date %}
+            {% set from_date = timesheet.start_date %}
+            {% set to_date = timesheet.end_date %}
+            {% endif %}
+
+            {% if from_date and to_date %}
+            <tr>
+                <td>{{ _("Performance Period") }}:</td>
+                {# If the year matches (first 4 chars in ISO-string), omit it for from_date #}
+                {% if from_date.year is defined %}
+                {% set date_format = "dd.mm." if from_date.year == to_date.year else "dd.mm.yy" %}
+                {% else %}
+                {% set date_format = "dd.mm." if from_date[:4] == to_date[:4] else "dd.mm.yy" %}
+                {% endif %}
+                <td class="text-right">{{ frappe.utils.formatdate(from_date, date_format) }} - {{ frappe.utils.formatdate(to_date, "dd.mm.yyyy") }}</td>
+            </tr>
+            {% endif %}
+        </table>
+    </div>
+</div>
+
+<div id="faltmarke-1" class="din-mark"></div>
+<div id="lochmarke" class="din-mark"></div>
+<div id="faltmarke-2" class="din-mark"></div>
+
+<!-- CONTENT -->
+<div id="text">
+    <div class="document-status">
+        {% if doc.docstatus == 0 %}
+        <span style="color: orange; font-weight: bold;">{{ _("Draft") }}</span>
+        {% elif doc.docstatus == 2 %}
+        <span style="color: red; font-weight: bold;">{{ _("Cancelled") }}</span>
+        {% endif %}
+    </div>
+    <div id="subject">
+        {% if doc.is_return %}
+        <p><strong>{{ _("Correction Invoice") }} {{ doc.name }}</strong></p>
+        <p class="text-small">{{ _("Rectifies invoice {0}").format(doc.return_against) }}</p>
+        {% elif doc.amended_from %}
+        <p><strong>{{ _("Cancellation Invoice") }} {{ doc.name }}</strong></p>
+        <p class="text-small">{{ _("Fully cancels and replaces invoice {0}").format(doc.amended_from) }}</p>
+        {% else %}
+        <p><strong>{{ _("Invoice") }} {{ doc.name }}</strong></p>
+        {% endif %}
+    </div>
+
+    <table class="w-100 text-small">
+        <thead class="black-border">
+            <tr>
+                <th style="width: 5%">{{ _("Sr") }}</th>
+                <th style="width: 45%">
+                    {{ _("Description") }}</th>
+                <th style="width: 10%">{{ _("Unit") if not print_settings.print_uom_after_quantity else '&nbsp;'}}</th>
+                <th style="width: 10%">{{ _("Qty") }}</th>
+                <th style="width: 12%">{{ _("Price") }}</th>
+                <!-- <th style="width: 15%">{{ _("Discount") }}</th> -->
+                <th style="width: 18%" class="text-right">{{ _("Amount") }}</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for n in doc.items %}
+            <tr>
+                <td>{{ loop.index }}</td>
+                <td><b>{{ _(n.item_name) }}</b></td>
+                <td>{{ _(n.uom) if not print_settings.print_uom_after_quantity else '&nbsp;'}}</td>
+                <td>
+                    {{ n.get_formatted("qty") }}
+                    {% if print_settings.print_uom_after_quantity %}
+                    {{ _(n.uom) }}
+                    {% endif %}
+                </td>
+                <td>{{ n.get_formatted("rate") }}</td>
+                <!-- <td>{{ n.get_formatted("discount_amount") }}</td> -->
+                <td class="text-right">{{ n.get_formatted("amount") }}</td>
+            </tr>
+            <tr>
+                <td></td>
+                <td colspan="4">{{ n.description }}</td>
+                <td></td>
+            </tr>
+            {% endfor %}
+        </tbody>
+
+        <tfoot class="black-border">
+            {% if doc.additional_discount_percentage or doc.discount_amount %}
+            <tr>
+                <td></td>
+                <td>{{ _("Total") }}</td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td class="text-right">{{ doc.get_formatted("total") }}</td>
+            </tr>
+            <tr>
+                <td></td>
+                <td>{{ _("Discount") }}</td>
+                <td></td>
+                <td></td>
+                <td>
+                    {% if doc.additional_discount_percentage %}
+                    {{ doc.get_formatted("additional_discount_percentage") }} &percnt;
+                    {% endif %}
+                </td>
+                <td class="text-right">
+                    {{ doc.get_formatted("discount_amount") }}
+                </td>
+            </tr>
+            {% endif %}
+            <tr>
+                <td></td>
+                <td>{{ _("Net Total") }}</td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td class="text-right">{{ doc.get_formatted("net_total") }}</td>
+            </tr>
+            {% if doc.tax_category == "Reverse Charge" -%}
+            <tr>
+                <td></td>
+                <td>Steuerschuldnerschaft des Leistungsempfängers / The recipient of the supply is liable for tax</td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td class="text-right"></td>
+            </tr>
+            {% else %}
+            {% for tax_row in doc.taxes -%}
+            {% if tax_row.tax_amount or print_settings.print_taxes_with_zero_amount %}
+            <tr>
+                <td></td>
+                <td>
+                    {{ tax_row.description }}
+                </td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td class="text-right">
+                    {{ tax_row.get_formatted("tax_amount") }}
+                </td>
+            </tr>
+            {% endif %}
+            {%- endfor %}
+
+            {% if doc.tax_exemption_reason %}
+            <tr>
+                <td></td>
+                <td>{{ _(doc.tax_exemption_reason) }}</td>
+                <td></td>
+                <td></td>
+                <td colspan="2"></td>
+            </tr>
+            {% endif %}
+            {%- endif %}
+            <tr>
+                <td></td>
+                <td>
+                    <strong>{{ _("Grand Total") }}</strong>
+                </td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td class="text-right"><strong>{{ doc.get_formatted("grand_total") }}</strong>
+                </td>
+            </tr>
+            {% if doc.total_advance %}
+            <tr>
+                <td></td>
+                <td>{{ _("Total Advance") }}</td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td class="text-right">
+                    {{ doc.get_formatted("total_advance") }}
+                </td>
+            </tr>
+            <tr>
+                <td></td>
+                <td>{{ _("Outstanding Amount") }}</td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td class="text-right">
+                    {{ doc.get_formatted("outstanding_amount") }}
+                </td>
+            </tr>
+            {% endif %}
+        </tfoot>
+    </table>
+
+    {% if doc.incoterm %}
+        <p>{{ _("Terms of delivery") }}: Incoterms® 2020 {{ doc.incoterm }}{% if doc.named_place %} {{ doc.named_place }}{% endif %}</p><br>
+    {% endif %}
+
+    {% if doc.terms and (doc.terms | striptags) %}
+    <br>
+    {{ doc.terms }}
+    {% endif %}
+
+    {% if doc.timesheets -%}
+    {# <div style="page-break-after: always"></div> #}
+    <div class="timesheets">
+        <p style="padding-top: 1em; padding-bottom: 0.33em">
+            <strong>{{ _("Time Logs") }}</strong>
+        </p>
+        <div data-fieldname="timesheets" data-fieldtype="Table">
+            <table class="w-100 text-small">
+                <thead class="black-border">
+                    <tr>
+                        <th style="width: 40px" class="table-sr">{{ _("Sr") }}</th>
+                        <th style="width: 80px;" class="" data-fieldname="timesheets" data-fieldtype="Table">
+                            {{_("Date")}}</th>
+                        <th style="width: 370px;" class="" data-fieldname="timesheets" data-fieldtype="Table">
+                            {{_("Note")}}</th>
+                        <th style="width: 80px;" class="text-right" data-fieldname="timesheets" data-fieldtype="Table">
+                            {{_("Duration")}}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for time_log in doc.timesheets | sort(attribute="start_date") %}
+                    {% set timesheet = frappe.get_doc("Timesheet", time_log.time_sheet)%}
+                    {% if timesheet.total_billable_amount > 0 %}
+                    <tr style="page-break-inside: avoid;">
+                        <td class="table-sr">{{ loop.index }}</td>
+                        <td class="" data-fieldname="timesheets" data-fieldtype="Table">
+                            <div class="value">
+                                {{ frappe.utils.formatdate(timesheet.start_date, "dd.mm.yy") }}
+                            </div>
+                        </td>
+                        <td class="" data-fieldname="timesheets" data-fieldtype="Table">
+                            <div class="value">
+                                {{ time_log.description }}
+                            </div>
+                        </td>
+                        <td class="text-right" data-fieldname="timesheets" data-fieldtype="Table">
+                            <div class="value">
+                                {{
+                                frappe.format(
+                                frappe.utils.rounded(time_log.billing_hours * 60) * 60,
+                                {"fieldtype": "Duration"}
+                                )
+                                }}
+                            </div>
+                        </td>
+                    </tr>
+                    {% endif %}
+                    {% endfor %}
+                </tbody>
+                <tfoot class="black-border">
+                    <tr>
+                        <td></td>
+                        <td></td>
+                        <td>
+                            <strong>
+                                {{ _("Total Duration") }}
+                            </strong>
+                        </td>
+                        <td class="text-right">
+                            <strong>
+                                {{
+                                frappe.format(
+                                frappe.utils.rounded(doc.total_billing_hours * 60) * 60,
+                                {"fieldtype": "Duration", "hide_days": 1}
+                                )
+                                }}
+                            </strong>
+                        </td>
+                    </tr>
+                </tfoot>
+            </table>
+        </div>
+    </div>
+    {%- endif %}
+</div>
+
+<!-- FOOTER -->
+<div id="footer-html" class="visible-pdf">
+    <div class="letter-head-footer">
+        <p id="pagenum" class="visible-pdf">
+            {{ _("Page {0} of {1}").format('<span class="page"></span>', '<span class="topage"></span>') }}
+        </p>
+        <div class="print-format-footer visible-pdf">
+            {{ footer }}
+        </div>
+        <div class="print-format-footer-html hidden-pdf">
+            {{ footer }}
+        </div>
+    </div>
+</div>