Merge commit '2e7a8a492ace7801db67815741dbfbb80f0608af' as 'cgilite'

[invoices] / odtgen.sh

diff --git a/odtgen.sh b/odtgen.sh
index e4c800a73e15f0c2d640b17570d887416ebedf0e..5efbcc2887dfb70a346cd1871f5a8dfa07fe79f9 100755 (executable)
--- a/odtgen.sh
+++ b/odtgen.sh
@@ -69,16 +69,16 @@ odt_content(){
        <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">
          <office:automatic-styles>
            <style:style style:name="Table1" style:family="table">
-             <style:table-properties style:width="6.6931in" fo:margin-top="0in" fo:margin-bottom="0in" table:align="margins"/>
+             <style:table-properties style:width="6.7in" fo:margin-top="0in" fo:margin-bottom="0in" table:align="margins"/>
            </style:style>
            <style:style style:name="Table1.A" style:family="table-column">
-             <style:table-column-properties style:column-width="0.8903in" style:rel-column-width="8717*"/>
+             <style:table-column-properties style:column-width="1.1in" style:rel-column-width="11000*"/>
            </style:style>
            <style:style style:name="Table1.B" style:family="table-column">
-             <style:table-column-properties style:column-width="3.4028in" style:rel-column-width="33318*"/>
+             <style:table-column-properties style:column-width="3.4in" style:rel-column-width="34000*"/>
            </style:style>
            <style:style style:name="Table1.CD" style:family="table-column">
-             <style:table-column-properties style:column-width="1.2in" style:rel-column-width="11749*"/>
+             <style:table-column-properties style:column-width="1.1in" style:rel-column-width="11000*"/>
            </style:style>
            <style:style style:name="Table1.1" style:family="table-cell">
              <style:table-cell-properties fo:padding="0.0201in" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
@@ -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>