changeset 8c22ba1a9f7d in modules/account_consolidation:default details: https://hg.tryton.org/modules/account_consolidation?cmd=changeset&node=8c22ba1a9f7d description: Merge header text of consolidation statement report diffstat:
consolidation_statement.fodt | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diffs (107 lines): diff -r 36731a8b0a71 -r 8c22ba1a9f7d consolidation_statement.fodt --- a/consolidation_statement.fodt Sun Oct 16 14:14:09 2022 +0200 +++ b/consolidation_statement.fodt Wed Oct 19 10:14:41 2022 +0200 @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field: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:xforms="http://www.w3.org/2002/xforms"; office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - <office:meta><meta:generator>LibreOffice/7.2.6.2$Linux_X86_64 LibreOffice_project/20$Build-2</meta:generator><meta:creation-date>2008-06-07T15:26:41</meta:creation-date><dc:date>2008-08-27T17:03:36</dc:date><meta:editing-cycles>1</meta:editing-cycles><meta:editing-duration>PT0S</meta:editing-duration><meta:document-statistic meta:table-count="3" meta:image-count="0" meta:object-count="0" meta:page-count="2" meta:paragraph-count="34" meta:word-count="95" meta:character-count="1053" meta:non-whitespace-character-count="992"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:generator>LibreOffice/7.3.6.2$Linux_X86_64 LibreOffice_project/30$Build-2</meta:generator><meta:creation-date>2008-06-07T15:26:41</meta:creation-date><dc:date>2008-08-27T17:03:36</dc:date><meta:editing-cycles>1</meta:editing-cycles><meta:editing-duration>PT0S</meta:editing-duration><meta:document-statistic meta:table-count="3" meta:image-count="0" meta:object-count="0" meta:page-count="2" meta:paragraph-count="34" meta:word-count="95" meta:character-count="1053" meta:non-whitespace-character-count="992"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> - <config:config-item config:name="ViewAreaTop" config:type="long">4445</config:config-item> + <config:config-item config:name="ViewAreaTop" config:type="long">0</config:config-item> <config:config-item config:name="ViewAreaLeft" config:type="long">0</config:config-item> - <config:config-item config:name="ViewAreaWidth" config:type="long">48129</config:config-item> - <config:config-item config:name="ViewAreaHeight" config:type="long">21989</config:config-item> + <config:config-item config:name="ViewAreaWidth" config:type="long">25269</config:config-item> + <config:config-item config:name="ViewAreaHeight" config:type="long">24026</config:config-item> <config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item> <config:config-item config:name="InBrowseMode" config:type="boolean">false</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view2</config:config-item> - <config:config-item config:name="ViewLeft" config:type="long">17152</config:config-item> - <config:config-item config:name="ViewTop" config:type="long">20350</config:config-item> + <config:config-item config:name="ViewLeft" config:type="long">3840</config:config-item> + <config:config-item config:name="ViewTop" config:type="long">5020</config:config-item> <config:config-item config:name="VisibleLeft" config:type="long">0</config:config-item> - <config:config-item config:name="VisibleTop" config:type="long">4445</config:config-item> - <config:config-item config:name="VisibleRight" config:type="long">48128</config:config-item> - <config:config-item config:name="VisibleBottom" config:type="long">26432</config:config-item> + <config:config-item config:name="VisibleTop" config:type="long">0</config:config-item> + <config:config-item config:name="VisibleRight" config:type="long">25268</config:config-item> + <config:config-item config:name="VisibleBottom" config:type="long">24024</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ViewLayoutColumns" config:type="short">0</config:config-item> <config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item> @@ -88,10 +88,11 @@ <config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item> <config:config-item config:name="PrinterSetup" config:type="base64Binary"/> <config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item> - <config:config-item config:name="Rsid" config:type="int">4093925</config:config-item> + <config:config-item config:name="Rsid" config:type="int">4095656</config:config-item> <config:config-item config:name="EmbeddedDatabaseName" config:type="string"/> <config:config-item config:name="FieldAutoUpdate" config:type="boolean">true</config:config-item> <config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item> + <config:config-item config:name="FootnoteInColumnToPageEnd" config:type="boolean">true</config:config-item> <config:config-item config:name="AlignTabStopPosition" config:type="boolean">true</config:config-item> <config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item> <config:config-item config:name="PrinterName" config:type="string"/> @@ -150,7 +151,7 @@ <office:styles> <style:default-style style:family="graphic"> <style:graphic-properties svg:stroke-color="#000000" draw:fill-color="#99ccff" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:flow-with-text="false"/> - <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false"> + <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:font-independent-line-spacing="false"> <style:tab-stops/> </style:paragraph-properties> <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Thorndale AMT" fo:font-size="12pt" fo:language="en" fo:country="US" style:letter-kerning="true" style:font-name-asian="Andale Sans UI" style:font-size-asian="10.5pt" style:language-asian="zxx" style:country-asian="none" style:font-name-complex="Andale Sans UI" style:font-size-complex="12pt" style:language-complex="zxx" style:country-complex="none"/> @@ -498,9 +499,9 @@ <style:header> <table:table table:name="Table2" table:style-name="Table2"> <table:table-column table:style-name="Table2.A" table:number-columns-repeated="3"/> - <table:table-row table:style-name="TableLine94207578775168"> + <table:table-row> <table:table-cell table:style-name="Table2.A1" office:value-type="string"> - <text:p text:style-name="Header">Compan<text:span text:style-name="T4">ies</text:span>: <text:placeholder text:placeholder-type="text"><', '.join(c.rec_name for c in companies)></text:placeholder></text:p> + <text:p text:style-name="Header">Companies: <text:placeholder text:placeholder-type="text"><', '.join(c.rec_name for c in companies)></text:placeholder></text:p> </table:table-cell> <table:table-cell table:style-name="Table2.A1" office:value-type="string"> <text:p text:style-name="P5">Statement</text:p> @@ -515,7 +516,7 @@ <table:table table:name="Table1" table:style-name="Table1"> <table:table-column table:style-name="Table1.A"/> <table:table-column table:style-name="Table1.B"/> - <table:table-row table:style-name="TableLine94207578778368"> + <table:table-row> <table:table-cell table:style-name="Table1.A1" office:value-type="string"> <text:p text:style-name="Footer">User: <text:placeholder text:placeholder-type="text"><user.rec_name></text:placeholder></text:p> </table:table-cell> @@ -555,7 +556,7 @@ <table:table table:name="Types" table:style-name="Types"> <table:table-column table:style-name="Types.A"/> <table:table-column table:style-name="Types.B"/> - <table:table-row table:style-name="TableLine94207578851600"> + <table:table-row> <table:table-cell table:style-name="Types.A1" office:value-type="string"> <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text"><for each="consolidation, path in consolidations"></text:placeholder></text:p> </table:table-cell> @@ -563,7 +564,7 @@ <text:p text:style-name="P11"/> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine94207578899664"> + <table:table-row> <table:table-cell table:style-name="Types.A1" office:value-type="string"> <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text"><choose></text:placeholder></text:p> <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text"><when test="len(path) <= 1"></text:placeholder></text:p> @@ -581,7 +582,7 @@ <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text"><format_currency(consolidation.amount, user.language, consolidation.currency) if consolidation.currency else ''></text:placeholder></text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine94207578952944"> + <table:table-row> <table:table-cell table:style-name="Types.A1" office:value-type="string"> <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p> </table:table-cell>
