X-Git-Url: http://git.plutz.net/?p=invoices;a=blobdiff_plain;f=invoices.sh;h=6538c967945693f7fe8711f4aa56a5f3b7450deb;hp=56dd244a6472bcc0cb996ac25a20cb065e16fcfa;hb=0332f87c1780ec8045980baa86e521fb003b8afa;hpb=864a9aad6a2d6ede85c0c3ad6312573f9a0804eb

diff --git a/invoices.sh b/invoices.sh
index 56dd244..6538c96 100755
--- a/invoices.sh
+++ b/invoices.sh
@@ -23,7 +23,9 @@ 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
 	$(sed q "$i")
@@ -41,22 +43,33 @@ list_invoices(){
     && date="$(date -d "@${date#date=}" +%x)" \
     || date="(unset)"
 
+    read -r taxtype nett tax gross <<-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
 	$(sed q "invoices/$id")
@@ -78,7 +91,10 @@ edit_invoice(){
   hourly="${hourly#hourly=}"
 
   tid="$(tid "invoices/$id")"
-  total=$(invoice_total "$id")
+
+  read -r taxtype nett tax gross <<-EOF
+	$(invoice_total "$id")
+	EOF
 
   cat <<-EOF 
 	[form method="POST" action="/update_invoice"
@@ -126,20 +142,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 €<br/> + VAT: %7.2f €<br/> [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 €<br/> incl VAT: %7.2f €<br/>+ 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)
             ]]
 	  ]
@@ -163,6 +171,9 @@ invoice_total(){
     [ "${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 +182,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