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

diff --git a/odtgen.sh b/odtgen.sh
index dbe2945..13b3126 100755
--- a/odtgen.sh
+++ b/odtgen.sh
@@ -58,7 +58,12 @@ 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"?>
 	<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2">
@@ -122,13 +127,13 @@ odt_content(){
 	        </draw:frame><draw:frame draw:style-name="fr2" draw:name="Rahmen2" text:anchor-type="paragraph" svg:width="1.8228in">
 	          <draw:text-box fo:min-height="1.8992in">
 	            <text:p text:style-name="P5"><!--
-                 -->$(HTML "$sender" |sed 'a<text:line-break/>')<!--
+                 -->$(HTML "$sender" |sed -r 's;(&#13\;)?&#10\;;<text:line-break/>;g')<!--
 	         --></text:p>
 	          </draw:text-box>
 	        </draw:frame><draw:frame draw:style-name="fr3" draw:name="Rahmen1" text:anchor-type="paragraph" svg:y="1.3799in" svg:width="3.4398in">
 	          <draw:text-box fo:min-height="1.3311in">
 	            <text:p text:style-name="P3"><!--
-                   -->$(HTML "$client" |sed 'a<text:line-break/>')<!--
+                   -->$(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>
@@ -139,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"/>
@@ -190,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>
@@ -209,7 +252,10 @@ odt_content(){
 
 genodt(){
   local id="$1" exdir="export/$1"
-  [ -d "$exdir" ] && rm "$exdir/META-INF"
+  [ -d "$exdir" ] && {
+    rm "$exdir/content.xml" "$exdir/styles.xml" "$exdir/META-INF/manifest.xml"
+    rmdir "$exdir/META-INF/" "$exdir/"
+  }
 
   read -r sender client date number vat vatrate <<-EOF
 	$(sed q "invoices/$id")
@@ -231,9 +277,8 @@ genodt(){
 
   [ -f "export/${id}.odt" ] && rm "export/${id}.odt"
   ( cd "$exdir"
-    zip "../${id}.odt" content.xml styles.xml META-INF/manifest.xml
+    zip -q "../${id}.odt" content.xml styles.xml META-INF/manifest.xml
   )
   rm "$exdir/content.xml" "$exdir/styles.xml" "$exdir/META-INF/manifest.xml"
   rmdir "$exdir/META-INF/" "$exdir/"
-  # lowriter --headless --convert-to pdf "${odtdoc}"
 }