X-Git-Url: http://git.plutz.net/?p=invoices;a=blobdiff_plain;f=odtgen.sh;h=9ed1e22bbc7c57e3ecf9f9793da49f9cc88120c9;hp=5efbcc2887dfb70a346cd1871f5a8dfa07fe79f9;hb=HEAD;hpb=da0991fe5c1d910682dd7bcb03adafee2a42ca37
diff --git a/odtgen.sh b/odtgen.sh
index 5efbcc2..abed2db 100755
--- a/odtgen.sh
+++ b/odtgen.sh
@@ -72,14 +72,17 @@ odt_content(){
-
+
-
+
+
+
+
@@ -92,6 +95,10 @@ odt_content(){
+
+
+
+
@@ -127,13 +134,13 @@ odt_content(){
$(HTML "$sender" |sed -r 's;(
\;)?
\;;;g')$(HTML "$sender" |sed -r 's;(
\;)?
\;|(�?[Dd]\;)?�?[aA]\;|\r?$;;g')
$(HTML "$client" |sed -r 's;(
\;)?
\;;;g')$(HTML "$client" |sed -r 's;(
\;)?
\;|(�?[Dd]\;)?�?[aA]\;|\r?$;;g')
Rechnung ${number}
@@ -152,8 +159,8 @@ odt_content(){
-
-
+
+
@@ -171,22 +178,28 @@ odt_content(){
$(sed 1d "invoices/$id" |while read -r time work hours; do
- time="$(UNSTRING "${time#time=}")"
- work="$(UNSTRING "${work#work=}")"
+ time="$(UNSTRING "${time#time=}" |sed -r 's;(
\;)?
\;|(�?[Dd]\;)?�?[aA]\;|\r?$;;g')"
+ work="$(UNSTRING "${work#work=}" |sed -r 's;(
\;)?
\;|(�?[Dd]\;)?�?[aA]\;|\r?$;;g')"
hours="$(UNSTRING "${hours#hours=}")"
cat <<-TROW
- ${time}
+ ${time}
${work}
- ${hours}
+ $( awk "BEGIN {
+ if ( int(${hours}) == ${hours} )
+ printf \"%i\", ${hours};
+ else
+ printf \"%i:%i\", int(${hours}), int((${hours} - int(${hours})) * 60);
+ }"
+ )
- $((${hourly} * ${hours})) â¬
+ $(awk "BEGIN { printf \"%.2f\", ${hourly} * ${hours}; }" ) â¬
TROW