Update invoice.py

invoice.py

@@ -239,33 +239,36 @@ def _clear_data(ws: Worksheet, start_row: int, col_first: int, col_last: int):
         if c: c.value = None
 
 def _apply_print_setup(ws: Worksheet):
-    """
-    Keep the template's print area if it exists; otherwise set an
-    explicit full-page range so formatted-but-empty regions (footer,
-    blank table rows, etc.) are included in the PDF.
-    """
-    # 0) If template already has a print area, don't shrink it.
-    if ws.print_area:
-        dim = ws.print_area
-    else:
-        # generous fixed area that matches template layout
-        dim = f"A1:{get_column_letter(PRINT_COLS)}{PRINT_ROWS}"
-        ws.print_area = dim
+    # 0) If template defines a print area, keep it
+    try:
+        dn = ws.parent.defined_names.get('_xlnm.Print_Area') or ws.parent.defined_names.get('Print_Area')
+        if dn:
+            # Ensure the defined area is attached to this sheet
+            for title, ref in dn.destinations:
+                if title == ws.title:
+                    ws.print_area = ref
+                    break
+    except Exception:
+        pass
 
-    # 1) Fit width to one page, allow height to flow; A4 portrait
+    # If still not set, use a generous fixed area that covers header, table, notes, footer banner
+    if not ws.print_area:
+        # Adjust columns/rows to your template; L x row 110 usually covers the full design
+        ws.print_area = "A1:L110"
+
+    # Fit the entire print area onto one page (A4 portrait)
     ws.sheet_properties.pageSetUpPr.fitToPage = True
     ps = ws.page_setup
     ps.orientation = "portrait"
     ps.paperSize = ws.PAPERSIZE_A4
     ps.fitToWidth = 1
-    ps.fitToHeight = 0     # don't force vertical shrink
-    ps.scale = None        # ensure fit-to-page mode
+    ps.fitToHeight = 1      # ensure the footer/banner is included on the single page
+    ps.scale = None
 
-    # 2) Clean look & reasonable margins
+    # Clean print
     ws.print_options.gridLines = False
-    ws.page_margins = PageMargins(
-        left=0.3, right=0.3, top=0.5, bottom=0.5, header=0.25, footer=0.25
-    )
+    ws.page_margins = PageMargins(left=0.3, right=0.3, top=0.5, bottom=0.5, header=0.25, footer=0.25)
+
 # ---------- date / numbering ----------
 def today_str() -> str:
     if sys.platform == "win32":
@@ -507,14 +510,17 @@ def _soffice_path() -> Optional[str]:
 
 def _convert_with_libreoffice(xlsx_path: str, pdf_path: str) -> bool:
     soffice = _soffice_path()
-    if not soffice: return False
+    if not soffice:
+        return False
     try:
+        # calc_pdf_Export with defaults reliably keeps drawing layer
         cmd = [
             soffice, "--headless", "--nologo", "--nofirststartwizard",
             "--convert-to", "pdf:calc_pdf_Export",
-            "--outdir", os.path.dirname(pdf_path), os.path.abspath(xlsx_path)
+            "--outdir", os.path.dirname(pdf_path),
+            os.path.abspath(xlsx_path),
         ]
-        r = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=60)
+        r = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=90)
         out_pdf = os.path.splitext(os.path.abspath(xlsx_path))[0] + ".pdf"
         if r.returncode == 0 and os.path.exists(out_pdf):
             os.replace(out_pdf, pdf_path)
@@ -523,6 +529,7 @@ def _convert_with_libreoffice(xlsx_path: str, pdf_path: str) -> bool:
         pass
     return False
 
+
 def _convert_with_excel_win32(xlsx_path: str, pdf_path: str) -> bool:
     if not win32_available: return False
     try: