bugfix: include issuance number and work items

[invoices] / odtgen.sh

diff --git a/odtgen.sh b/odtgen.sh
index 13b3126e5d1ed084f166d75f709ec2d5d25e4651..9ed1e22bbc7c57e3ecf9f9793da49f9cc88120c9 100755 (executable)
--- a/odtgen.sh
+++ b/odtgen.sh
@@ -12,7 +12,7 @@ odt_manifest(){
 }
 
 odt_stylesheet(){
-  local iban="$2" bic="$3"
+  local iban="$1" bic="$2"
 
   cat <<-EOF
        <?xml version="1.0" encoding="UTF-8"?>
@@ -46,8 +46,8 @@ odt_stylesheet(){
              <style:footer>
                <text:p text:style-name="MP1">
                  <text:span text:style-name="MT1">Bankverbindung - IBAN:</text:span>
-                 <text:span>${iban} |</text:span>
-                 <text:span text:style-name="MT1">BIC:</text:span>
+                 <text:span>${iban}</text:span>
+                 <text:span text:style-name="MT1">| BIC:</text:span>
                  <text:span>${bic}</text:span>
                </text:p>
              </style:footer>
@@ -136,7 +136,7 @@ odt_content(){
                    -->$(HTML "$client" |sed -r 's;(&#13\;)?&#10\;;<text:line-break/>;g')<!--
                   --></text:p>
                  </draw:text-box>
-               </draw:frame><text:span text:style-name="T3">Rechnung ${issuance}</text:span>
+               </draw:frame><text:span text:style-name="T3">Rechnung ${number}</text:span>
              </text:p>
              <text:p text:style-name="P3"/>
              <text:p text:style-name="P3"/>
@@ -180,7 +180,7 @@ odt_content(){
                            <text:p text:style-name="P3">${time}</text:p>
                          </table:table-cell>
                          <table:table-cell table:style-name="Table1.2" office:value-type="string">
-                           <text:p text:style-name="P3">${item}</text:p>
+                           <text:p text:style-name="P3">${work}</text:p>
                          </table:table-cell>
                          <table:table-cell table:style-name="Table1.2" office:value-type="string">
                            <text:p text:style-name="P5">${hours}</text:p>
@@ -257,11 +257,11 @@ genodt(){
     rmdir "$exdir/META-INF/" "$exdir/"
   }
 
-  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
-  read -r sender iban bic <"senders/${sender#sender=}"
-  read -r client hourly <"clients/${client#client=}"
+  read -r sender iban bic x<"senders/${sender#sender=}"
+  read -r client chourly x<"clients/${client#client=}"
 
   mkdir -p "$exdir/META-INF"
   odt_manifest >"$exdir/META-INF/manifest.xml"
@@ -282,3 +282,11 @@ genodt(){
   rm "$exdir/content.xml" "$exdir/styles.xml" "$exdir/META-INF/manifest.xml"
   rmdir "$exdir/META-INF/" "$exdir/"
 }
+
+genpdf(){
+  local id="$1"
+  genodt "$id"
+  lowriter --convert-to pdf --outdir "export/" "export/${id}.odt" >/dev/null
+  rm "export/${id}.odt"
+}
+