X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=invoices.sh;h=b99d8f2431b4a9b6e0b465acd3992b4a34f24794;hb=ac0e0282a64b4b03fd1e8be053a5e916713144d5;hp=6538c967945693f7fe8711f4aa56a5f3b7450deb;hpb=0332f87c1780ec8045980baa86e521fb003b8afa;p=invoices
diff --git a/invoices.sh b/invoices.sh
index 6538c96..b99d8f2 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,59 +23,90 @@ client_list(){
}
list_invoices(){
+ [ -d invoices/ ] || return 0
+
+ printf '[h1 Open]'
+ for i in invoices/*; do case "$(sed 1q <$i)" in
+ *status=open*) list_invoice "$i";;
+ *status=*) :;;
+ *) list_invoice "$i";;
+ esac; done
+
+ for n in resent:Resent sent:Sent paid:Paid cancelled:Cancelled; do
+ printf '[h1 %s]' "${n#*:}"
+ for i in invoices/*; do case "$(sed 1q <$i)" in
+ *status=${n%:*}*) list_invoice "$i";;
+ esac; done
+ done
+}
+
+list_invoice(){
+ local i="$1"
local sender client date number vat vatrate iban bic hourly \
- taxtype nett tax gross total
+ taxtype nett tax gross total status
- [ -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 status x<<-EOF
$(sed q "$i")
EOF
- [ ! -f "senders/${sender#sender=}" ] \
- && sender="(unset)" \
- || read -r sender iban bic <"senders/${sender#sender=}"
+ [ ! -f "senders/${sender#sender=}" ] \
+ && sender="(unset)" \
+ || read -r sender iban bic x<"senders/${sender#sender=}"
- [ ! -f "clients/${client#client=}" ] \
- && client="(unset)" \
- || read -r client hourly <"clients/${client#client=}"
+ [ ! -f "clients/${client#client=}" ] \
+ && client="(unset)" \
+ || read -r client hourly x<"clients/${client#client=}"
- [ "${date#date=}" -ge 0 ] 2>&- \
- && date="$(date -d "@${date#date=}" +%x)" \
- || date="(unset)"
+ [ "${date#date=}" -ge 0 ] 2>&- \
+ && date="$(date -d "@${date#date=}" +%x)" \
+ || date="(unset)"
- read -r taxtype nett tax gross <<-EOF
+ 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:] %s
- [a href="/invoices/%s" Edit]
- ]' "$(UNSTRING "${number#number=}" |HTML)" \
- "$(UNSTRING "${sender#address=}" |sed q |HTML)" \
- "$(UNSTRING "${client#address=}" |sed q |HTML)" "$(HTML "$date")" \
- "$total" \
- "$(HTML ${i#invoices/})"
- done
+ case $taxtype in
+ nett) total="${nett} ⬠+ VAT";;
+ gross) total="${gross} ⬠incl. VAT";;
+ *) total="${gross} â¬";;
+ esac
+
+ case $status in
+ status=sent|status=resent|status=paid|status=cancelled)
+ status="${status#status=}"
+ ;;
+ *) status=open;;
+ esac
+
+ printf '[div .invoice
+ [h2
+ %s]
+ [label From:] %s [label To:] %s [label on] %s
+ [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")" \
+ "$total" \
+ "$(HTML ${i#invoices/})"
}
edit_invoice(){
local id="$1" sender client date number vat vatrate caddress hourly \
- taxtype nett tax gross
+ taxtype nett tax gross status
if [ -f "invoices/$id" ]; then
- read -r sender client date number vat vatrate<<-EOF
+ read -r sender client date number vat vatrate hourly status x<<-EOF
$(sed q "invoices/$id")
EOF
fi
+ case $status in
+ status=sent|status=resent|status=paid|status=cancelled)
+ status="${status#status=}"
+ ;;
+ *) status=open;;
+ esac
+
[ "${date#date=}" -ge 0 ] 2>&- \
&& date="$(date -d "@${date#date=}" +%F)" \
|| date="$(date +%F)"
@@ -87,12 +118,17 @@ 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")"
+ tid="$(transid "invoices/$id")"
- read -r taxtype nett tax gross <<-EOF
+ read -r taxtype nett tax gross x<<-EOF
$(invoice_total "$id")
EOF
@@ -116,6 +152,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)]
@@ -127,18 +166,20 @@ 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
- hours="$(UNSTRING "${hours#hours=}" |grep -m1 -xE '[0-9]+' || printf 0)"
+ | while read -r time work hours x; do
+ hours="$(UNSTRING "${hours#hours=}" \
+ |grep -m1 -xE '\.[0-9]+|[0-9]+\.?[0-9]*' || printf 0)"
printf '[tr
[td [textarea name=time
%s] ]
[td [textarea name=work
%s] ]
- [td [input type=number name=hours value="%s"] ]
+ [td [input type=number name=hours value="%g" step=any] ]
[td %s]
]' "$(UNSTRING "${time#time=}" |HTML)" \
"$(UNSTRING "${work#work=}" |HTML)" \
- "$hours" "$((hours * hourly)) â¬"
+ "$hours" \
+ "$(awk "BEGIN { printf \"%.2f â¬\", ${hours} * ${hourly}; }")"
done
)
[tr [td colspan=4
@@ -151,6 +192,13 @@ $({ sed 1d "invoices/$id"; printf 'time= work= hours=\n'; } \
esac)
]]
]
+ [select name=status
+ [option value=open $( [ $status = open ] && printf selected=selected ) Open]
+ [option value=sent $( [ $status = sent ] && printf selected=selected ) Sent]
+ [option value=resent $( [ $status = resent ] && printf selected=selected ) Resent]
+ [option value=paid $( [ $status = paid ] && printf selected=selected ) Paid]
+ [option value=cancelled $( [ $status = cancelled ] && printf selected=selected ) Cancelled]
+ ]
[submit "genpdf" "$tid" Export PDF]
[submit "update" "$tid" Update]
]
@@ -162,12 +210,10 @@ 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
@@ -177,10 +223,10 @@ invoice_total(){
sed 1d "invoices/$id" \
| { while read -r time work hours; do
- [ "${hours#hours=}" -gt 0 ] 2>&- \
+ [ "${hours#hours=}" ] 2>&- \
&& hours="${hours#hours=}" \
|| hours=0
- total=$((total + hours * hourly))
+ total=$(awk "BEGIN { printf \"%.2f\", ${total} + ${hours} * ${hourly}; }")
done
case $vat in
vat=nett)
@@ -209,7 +255,7 @@ invoice_total(){
update_invoice(){
local id="$(POST id |checkid)" extra=0 tid
- tid="$(tid invoices/$id)"
+ tid="$(transid invoices/$id)"
if [ "$(POST update)" = "$tid" ] || [ "$(POST genpdf)" = "$tid" ]; then
mkdir -p invoices
@@ -218,12 +264,14 @@ 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 status=%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]+')" \
+ "$(POST status |grep -m1 -xE 'open|sent|resent|paid|cancelled')"
for n in $(seq 1 $extra); do
printf 'time=%s work=%s hours=%s\n' \
"$(POST time $n |STRING)" "$(POST work $n |STRING)" \
@@ -231,12 +279,21 @@ update_invoice(){
| grep -xvF 'time= work= hours=0'
done
} >"invoices/$id"
+
+ [ -d .git ] && {
+ git add "invoices/$id"
+ git commit -m 'Update invoice info for "'"$(POST number)"'"' -- "invoices/$id"
+ } >/dev/null
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"