preparing monthly invoicing function

Author: clstaudt

tuttle/invoicing.py

@@ -19,6 +19,7 @@ def generate_invoice(
     timesheets: List[Timesheet],
     contract: Contract,
     date: datetime.date = datetime.date.today(),
+    counter: int = None,
 ) -> Invoice:
     invoice = Invoice(
         date=date,
@@ -36,7 +37,8 @@ def generate_invoice(
             VAT_rate=contract.VAT_rate,
             description=timesheet.title,
         )
-    invoice.generate_number()
+    # TODO: replace with auto-incrementing numbers
+    invoice.generate_number(counter=counter)
     return invoice
 
 

tuttle/model.py

@@ -340,12 +340,14 @@ def total(self) -> Decimal:
         """Total invoiced amount."""
         return self.sum + self.VAT_total
 
-    def generate_number(self, pattern=None):
+    def generate_number(self, pattern=None, counter=None):
         """Generate an invoice number"""
         date_prefix = self.date.strftime("%Y-%m-%d")
         # suffix = hashlib.shake_256(str(uuid.uuid4()).encode("utf-8")).hexdigest(2)
         # TODO: auto-increment suffix for invoices generated on the same day
-        suffix = "01"
+        if counter is None:
+            counter = 1
+        suffix = f"{counter:02}"
         self.number = f"{date_prefix}-{suffix}"
 
     @property

tuttle/rendering.py

@@ -62,7 +62,7 @@ def as_currency(number):
         )
 
     def as_percentage(number):
-        return f"{number * 100} %"
+        return f"{number * 100:.1f} %"
 
     template_name = f"invoice-anvil"
     template_path = get_template_path(template_name)
@@ -83,7 +83,8 @@ def as_percentage(number):
         return html
     else:
         # write invoice html
-        prefix = f"{invoice.number}-{invoice.client.name.lower()}"
+        client_suffix = invoice.client.name.lower().split()[0]
+        prefix = f"{invoice.number}-{client_suffix}"
         invoice_dir = Path(out_dir) / Path(prefix)
         invoice_dir.mkdir(parents=True, exist_ok=True)
         invoice_path = invoice_dir / Path(f"{prefix}.html")

tuttle/timetracking.py

@@ -67,6 +67,14 @@ def generate_timesheet(
         return ts_table
 
     # TODO: grouping
+    if group_by is None:
+        pass
+    elif group_by == "day":
+        raise NotImplementedError("TODO")
+    elif group_by == "week":
+        raise NotImplementedError("TODO")
+    else:
+        raise ValueError(f"unknown group_by argument: {group_by}")
 
     ts = Timesheet(
         title=f"{project.title} - {period_str}",