diff --git a/main.py b/main.py index d9e0dfe..512cf5a 100644 --- a/main.py +++ b/main.py @@ -63,7 +63,7 @@ def compile_invoice(id): loader=jinja2.FileSystemLoader(os.path.abspath('.')) ) if invoice["mode"] == "hourly": - invoice["total"] = invoice["per_hour"] * invoice["hours"] + invoice["total"] = invoice["per_hour"] * (invoice["hours"] + invoice["minutes"] / 60) data = { "from": load_yaml("from.yaml"), "to": load_yaml("recipients/{id}.yaml".format(id=invoice["recipient"])), @@ -131,6 +131,7 @@ def sign_invoice(id): ), "-b", "LOCAL", # use local Bürgerkarte "-a", # automatically position signature + "-v", "true" if name == "Rechnung" else "false", "-s" # save without asking ]) diff --git a/template.tex b/template.tex index 7f2d822..04e0ec2 100644 --- a/template.tex +++ b/template.tex @@ -104,7 +104,7 @@ \VAR{invoice.description} & \EUR{\VAR{invoice.per_hour | formatdigit }} & - \VAR{invoice.hours} & + \VAR{invoice.hours}:\VAR{invoice.minutes} & \EUR{\VAR{invoice.total | formatdigit }} \\