X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=invoices.sh;h=93292cbee74a31f0b69613940c8a4bc72b215712;hb=95445a19d5a6dc3133a3e539e1c012425149a401;hp=56dd244a6472bcc0cb996ac25a20cb065e16fcfa;hpb=864a9aad6a2d6ede85c0c3ad6312573f9a0804eb;p=invoices
diff --git a/invoices.sh b/invoices.sh
index 56dd244..93292cb 100755
--- a/invoices.sh
+++ b/invoices.sh
@@ -3,7 +3,7 @@
sender_list(){
local select="$1" n name address iban bic
[ -d senders/ ] && for n in '' senders/*; do
- [ "$n" ] && read -r address iban bic <"$n"
+ [ "$n" ] && read -r address iban bic x<"$n"
name="$(UNSTRING "${address#address=}" |sed q |HTML)"
[ "${n#senders/}" = "$select" ] \
&& printf '' "${n#senders/}" "$name" \
@@ -14,7 +14,7 @@ sender_list(){
client_list(){
local select="$1" n address hourly name
[ -d clients/ ] && for n in '' clients/*; do
- [ "$n" ] && read -r address hourly <"$n"
+ [ "$n" ] && read -r address hourly x<"$n"
name="$(UNSTRING "${address#address=}" |sed q |HTML)"
[ "${n#clients/}" = "$select" ] \
&& printf '' "${n#clients/}" "$name" \
@@ -23,42 +23,55 @@ client_list(){
}
list_invoices(){
- local sender client date number vat vatrate iban bic hourly
+ local sender client date number vat vatrate iban bic hourly \
+ taxtype nett tax gross total
+
[ -d invoices/ ] && for i in invoices/*; do
- read -r sender client date number vat vatrate<<-EOF
+ read -r sender client date number vat vatrate hourly x<<-EOF
$(sed q "$i")
EOF
[ ! -f "senders/${sender#sender=}" ] \
&& sender="(unset)" \
- || read -r sender iban bic <"senders/${sender#sender=}"
+ || read -r sender iban bic x<"senders/${sender#sender=}"
[ ! -f "clients/${client#client=}" ] \
&& client="(unset)" \
- || read -r client hourly <"clients/${client#client=}"
+ || read -r client hourly x<"clients/${client#client=}"
[ "${date#date=}" -ge 0 ] 2>&- \
&& date="$(date -d "@${date#date=}" +%x)" \
|| date="(unset)"
+ read -r taxtype nett tax gross x<<-EOF
+ $(invoice_total "${i#invoices/}")
+ EOF
+ case $taxtype in
+ nett) total="${nett} ⬠+ VAT";;
+ gross) total="${gross} ⬠incl. VAT";;
+ *) total="${gross} â¬";;
+ esac
+
printf '[div .invoice
[h2
%s]
[label From:] %s [label To:] %s [label on] %s
- [label Amount:] %.2f â¬
+ [label Amount:] %s
[a href="/invoices/%s" Edit]
]' "$(UNSTRING "${number#number=}" |HTML)" \
"$(UNSTRING "${sender#address=}" |sed q |HTML)" \
"$(UNSTRING "${client#address=}" |sed q |HTML)" "$(HTML "$date")" \
- "$(invoice_total "${i#invoices/}")" \
+ "$total" \
"$(HTML ${i#invoices/})"
done
}
edit_invoice(){
- local id="$1" sender client date number vat vatrate caddress hourly total
+ local id="$1" sender client date number vat vatrate caddress hourly \
+ taxtype nett tax gross
+
if [ -f "invoices/$id" ]; then
- read -r sender client date number vat vatrate<<-EOF
+ read -r sender client date number vat vatrate hourly x<<-EOF
$(sed q "invoices/$id")
EOF
fi
@@ -74,11 +87,19 @@ edit_invoice(){
|| vatrate=19
[ -f "clients/${client#client=}" ] \
- && read -r caddress hourly <"clients/${client#client=}"
- hourly="${hourly#hourly=}"
+ && read -r caddress chourly x<"clients/${client#client=}"
+ [ "${chourly#hourly=}" -ge 0 ] 2>&- \
+ && chourly="${chourly#hourly=}" \
+ || chourly=0
+ [ "${hourly#hourly=}" -ge 0 ] 2>&- \
+ && hourly="${hourly#hourly=}" \
+ || hourly="${chourly}"
tid="$(tid "invoices/$id")"
- total=$(invoice_total "$id")
+
+ read -r taxtype nett tax gross x<<-EOF
+ $(invoice_total "$id")
+ EOF
cat <<-EOF
[form method="POST" action="/update_invoice"
@@ -100,6 +121,9 @@ edit_invoice(){
[label for=date Date:]
[input #date name=date value="${date}" placeholder="YYYY-MM-TT"]
+ [label for=hourly Hourly Rate:]
+ [input #hourly type=number name=hourly value="${hourly}"]
+
[radio "vat" "smallbusiness" #vatsb $([ "${vat#vat=}" = smallbusiness ] && printf checked) ]
[label for=vatsb Small business exemption from VAT]
[radio "vat" "nett" #vatnett $([ "${vat#vat=}" = nett ] && printf checked)]
@@ -111,7 +135,7 @@ edit_invoice(){
[table
[tr [th Date] [th Work] [th Hours] [th Price] ]
$({ sed 1d "invoices/$id"; printf 'time= work= hours=\n'; } \
- | while read -r time work hours; do
+ | while read -r time work hours x; do
hours="$(UNSTRING "${hours#hours=}" |grep -m1 -xE '[0-9]+' || printf 0)"
printf '[tr
[td [textarea name=time
@@ -126,20 +150,12 @@ $({ sed 1d "invoices/$id"; printf 'time= work= hours=\n'; } \
done
)
[tr [td colspan=4
- $(case $vat in
- vat=nett)
- awk "BEGIN {
- printf \"Sum: %7.2f â¬
+ VAT: %7.2f â¬
[strong Total:] %7.2f â¬\",
- $total, int($total * $vatrate + .5) / 100,
- $total + int($total * $vatrate + .5) / 100
- }" ;;
- vat=gross)
- awk "BEGIN {
- printf \"[strong Total:] %7.2f â¬
incl VAT: %7.2f â¬
+ nett: %7.2f â¬\",
- $total, int($total / (100 + $vatrate) * $vatrate * 100 + .5) / 100,
- $total - int($total / (100 + $vatrate) * $vatrate * 100 + .5) / 100
- }" ;;
- *) printf '[strong Total:] %.2f â¬' "$total" ;;
+ $(case $taxtype in
+ (nett) printf 'Sum: %7.2f â¬[br] + VAT: %7.2f â¬[br] [strong Total:] %7.2f â¬' \
+ $nett $tax $gross ;;
+ (gross) printf '[strong Total:] %7.2f â¬[br] incl. nett: %7.2f â¬[br] + VAT: %7.2f â¬' \
+ $gross $nett $tax ;;
+ (*) printf '[strong Total:] %.2f â¬' $nett ;;
esac)
]]
]
@@ -154,15 +170,16 @@ invoice_total(){
total=0 caddress hourly time work hours
if [ -f "invoices/$id" ]; then
- read -r sender client date number vat vatrate<<-EOF
+ read -r sender client date number vat vatrate hourly x<<-EOF
$(sed q "invoices/$id")
EOF
- [ -f "clients/${client#client=}" ] \
- && read -r caddress hourly <"clients/${client#client=}"
[ "${hourly#hourly=}" -gt 0 ] 2>&- \
&& hourly="${hourly#hourly=}" \
|| hourly=0
+ [ "${vatrate#vatrate=}" -ge 0 ] 2>&- \
+ && vatrate="${vatrate#vatrate=}" \
+ || vatrate=19
sed 1d "invoices/$id" \
| { while read -r time work hours; do
@@ -171,7 +188,25 @@ invoice_total(){
|| hours=0
total=$((total + hours * hourly))
done
- printf %.2f\\n "$total"
+ case $vat in
+ vat=nett)
+ awk "BEGIN {
+ printf \"nett %.2f %.2f %.2f\",
+ $total, int($total * $vatrate + .5) / 100,
+ $total + int($total * $vatrate + .5) / 100
+ }" ;;
+ vat=gross)
+ awk "BEGIN {
+ printf \"gross %.2f %.2f %.2f\",
+ $total - int($total / (100 + $vatrate) * $vatrate * 100 + .5) / 100,
+ int($total / (100 + $vatrate) * $vatrate * 100 + .5) / 100, $total
+ }" ;;
+ *)
+ awk "BEGIN {
+ printf \"notax %.2f %.2f %.2f\",
+ $total, 0, $total
+ }" ;;
+ esac
}
else
printf %.2f\\n 0
@@ -189,12 +224,13 @@ update_invoice(){
[ "$n" -gt "$extra" ] && extra="$n"
done
- { printf 'sender=%s client=%s date=%s number=%s vat=%s vatrate=%s\n' \
+ { printf 'sender=%s client=%s date=%s number=%s vat=%s vatrate=%s hourly=%s\n' \
"$(POST sender)" "$(POST client)" \
"$(date -d "$(POST date)" +%s)" \
"$(POST number |STRING)" \
"$(POST vat |grep -m1 -xE 'smallbusiness|gross|nett')" \
- "$(POST vatrate |grep -m1 -xE '[0-9]+')"
+ "$(POST vatrate |grep -m1 -xE '[0-9]+')" \
+ "$(POST hourly |grep -m1 -xE '[0-9]+')"
for n in $(seq 1 $extra); do
printf 'time=%s work=%s hours=%s\n' \
"$(POST time $n |STRING)" "$(POST work $n |STRING)" \
@@ -204,10 +240,14 @@ update_invoice(){
} >"invoices/$id"
fi
if [ "$(POST genpdf)" ]; then
+ read -r sender client date x<"invoices/$id"
+ read -r saddress x <"senders/${sender#sender=}"
+ read -r caddress x <"clients/${client#client=}"
+ filename="Rechnung $(UNSTRING "${saddress#address=}" |sed 1q) an $(UNSTRING "${caddress#address=}" |sed 1q) $(date -d@"${date#date=}" +%F).pdf"
+
. $_EXEC/odtgen.sh
- genodt "$id"
- lowriter --convert-to pdf --outdir export/ "export/${id}.odt" >/dev/null
- REDIRECT "/export/${id}.pdf"
+ genpdf "$id"
+ REDIRECT "/export/${id}.pdf/$(URL "${filename}" |sed s/%0D//g)"
exit 0
fi
REDIRECT "/invoices/$id"