X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;ds=sidebyside;f=odtgen.sh;h=177065a9c9a0fd10f92cba31058aceacc51f1b98;hb=026cd2e0fc6081c19d681a40720f7a70b449f3d8;hp=67232a9659cfcda9e465712ec51a9d6edde8634b;hpb=95b87c108d4b5829bb3184e3a2bd312140d87bbd;p=invoices
diff --git a/odtgen.sh b/odtgen.sh
index 67232a9..177065a 100755
--- a/odtgen.sh
+++ b/odtgen.sh
@@ -72,14 +72,17 @@ odt_content(){
-
+
-
+
+
+
+
@@ -92,6 +95,10 @@ odt_content(){
+
+
+
+
@@ -152,8 +159,8 @@ odt_content(){
-
-
+
+
@@ -171,13 +178,13 @@ 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 's;\r;;g')"
+ work="$(UNSTRING "${work#work=}" |sed 's;\r;;g')"
hours="$(UNSTRING "${hours#hours=}")"
cat <<-TROW
- ${time}
+ ${time}
${work}