X-Git-Url: http://git.plutz.net/?p=invoices;a=blobdiff_plain;f=odtgen.sh;h=13b3126e5d1ed084f166d75f709ec2d5d25e4651;hp=f9b7d62cf920e7c0371eea17609203b5f59379dc;hb=0332f87c1780ec8045980baa86e521fb003b8afa;hpb=864a9aad6a2d6ede85c0c3ad6312573f9a0804eb

diff --git a/odtgen.sh b/odtgen.sh
index f9b7d62..13b3126 100755
--- a/odtgen.sh
+++ b/odtgen.sh
@@ -58,7 +58,11 @@ odt_stylesheet(){
 }
 
 odt_content(){
-  local id="$1" sender="$2" client="$3" date="$4" number="$5" vat="$6" vatrate="$7" hourly="$8"
+  local id="$1" sender="$2" client="$3" date="$4" number="$5" vat="$6" vatrate="$7" hourly="$8" \
+        taxtype nett tax gross
+  read -r taxtype nett tax gross <<-EOF
+	$(invoice_total "$id")
+	EOF
 
   cat <<-EOF
 	<?xml version="1.0" encoding="UTF-8"?>
@@ -140,8 +144,8 @@ odt_content(){
              -->$(case $vat in
                   (smallbusiness)
                     printf '<text:line-break/>Gemäß Kleinunternehmerregelung (§19 Umsatzsteuergesetz) wird keine Umsatzsteuer berechnet.';;
-                  (nett)  printf 'zuzüglich %i%% MWSt.' "$vatrate";;
-                  (gross) printf '(einschließlich %i\% MWSt.)' "$vatrate";;
+                  (nett)  printf 'zuzüglich %i%% MwSt.' "$vatrate";;
+                  (gross) printf '(einschließlich %i%% MwSt.)' "$vatrate";;
                  esac)<!--
            --></text:p>
 	      <text:p text:style-name="P3"/>
@@ -191,15 +195,53 @@ odt_content(){
 	          <table:table-cell table:style-name="Table1.6" office:value-type="string">
 	            <text:p text:style-name="P6"/>
 	          </table:table-cell>
-	          <table:table-cell table:style-name="Table1.6" office:value-type="string">
-	            <text:p text:style-name="P6"/>
-	          </table:table-cell>
-	          <table:table-cell table:style-name="Table1.6" office:value-type="string">
-	            <text:p text:style-name="P7">Summe:</text:p>
-	          </table:table-cell>
-	          <table:table-cell table:style-name="Table1.6" office:value-type="string">
-	            <text:p text:style-name="P7">$(invoice_total "$id") €</text:p>
-	          </table:table-cell>
+                  $(case $taxtype in
+                    (nett) cat <<-TCELL
+			<table:table-cell table:style-name="Table1.6" table:number-columns-spanned="2" office:value-type="string">
+			  <text:p text:style-name="P5">
+			  Zwischensumme:<text:line-break/>
+			  zzgl. ${vatrate}% MwSt.:<text:line-break/>
+			  </text:p>
+			  <text:p text:style-name="P7">zu zahlender Betrag:</text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Table1.6" office:value-type="string">
+			  <text:p text:style-name="P5">
+			  ${nett} €<text:line-break/>
+			  ${tax} €<text:line-break/>
+			  </text:p>
+			  <text:p text:style-name="P7">${gross} €</text:p>
+			</table:table-cell>
+			TCELL
+                        ;;
+                    (gross) cat <<-TCELL
+			<table:table-cell table:style-name="Table1.6" table:number-columns-spanned="2" office:value-type="string">
+			  <text:p text:style-name="P7">zu zahlender Betrag:</text:p>
+			  <text:p text:style-name="P5">
+			  <text:line-break/>
+			  enthaltene MwSt (${vatrate}%):<text:line-break/>
+			  enthaltener Netto-Betrag:<!--
+			--></text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Table1.6" office:value-type="string">
+			  <text:p text:style-name="P7">${gross} €</text:p>
+			  <text:p text:style-name="P5">
+			  <text:line-break/>
+			  ${tax} €<text:line-break/>
+			  ${nett} €<!--
+			--></text:p>
+			</table:table-cell>
+			TCELL
+                        ;;
+                    (*) cat <<-TCELL
+			<table:table-cell table:style-name="Table1.6" table:number-columns-spanned="2" office:value-type="string">
+			  <text:p text:style-name="P7">zu zahlender Betrag:</text:p>
+			</table:table-cell>
+			<table:table-cell table:style-name="Table1.6" office:value-type="string">
+			  <text:p text:style-name="P7">${gross} €</text:p>
+			</table:table-cell>
+			TCELL
+                        ;;
+                  esac)
 	        </table:table-row>
 	      </table:table>
 	    </office:text>