tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Fix chained set_lang call in report

Browse Source 
issue6548
review42621002
This commit is contained in:
Cédric Krier
2017-09-07 18:51:45 +02:00
parent d5c20b74b6
commit cefbce123a
1 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mandate.fodt
+32 -16
View File
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<office:document 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:config="urn:oasis:names:tc:opendocument:xmlns:config: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:mimetype="application/vnd.oasis.opendocument.text">
<office:meta><meta:creation-date>2014-09-18T12:22:31.532910267</meta:creation-date><meta:editing-duration>PT31M48S</meta:editing-duration><meta:editing-cycles>9</meta:editing-cycles><meta:generator>LibreOffice/5.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-2</meta:generator><dc:date>2016-10-06T13:46:40.329044671</dc:date><meta:document-statistic meta:character-count="2400" meta:image-count="0" meta:non-whitespace-character-count="2221" meta:object-count="0" meta:page-count="3" meta:paragraph-count="68" meta:table-count="2" meta:word-count="246"/></office:meta>
<office:meta><meta:creation-date>2014-09-18T12:22:31.532910267</meta:creation-date><meta:editing-duration>PT32M58S</meta:editing-duration><meta:editing-cycles>10</meta:editing-cycles><meta:generator>LibreOffice/5.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-2</meta:generator><dc:date>2017-08-31T23:14:17.634469076</dc:date><meta:document-statistic meta:table-count="2" meta:image-count="0" meta:object-count="0" meta:page-count="3" meta:paragraph-count="69" meta:word-count="247" meta:character-count="2394" meta:non-whitespace-character-count="2215"/></office:meta>
<office:settings>
<config:config-item-set config:name="ooo:view-settings">
<config:config-item config:name="ViewAreaTop" config:type="long">0</config:config-item>
<config:config-item config:name="ViewAreaTop" config:type="long">23142</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">43760</config:config-item>
<config:config-item config:name="ViewAreaHeight" config:type="long">21691</config:config-item>
<config:config-item config:name="ViewAreaWidth" config:type="long">23440</config:config-item>
<config:config-item config:name="ViewAreaHeight" config:type="long">21451</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">13085</config:config-item>
<config:config-item config:name="ViewTop" config:type="long">5313</config:config-item>
<config:config-item config:name="ViewLeft" config:type="long">2925</config:config-item>
<config:config-item config:name="ViewTop" config:type="long">34209</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">0</config:config-item>
<config:config-item config:name="VisibleRight" config:type="long">43759</config:config-item>
<config:config-item config:name="VisibleBottom" config:type="long">21689</config:config-item>
<config:config-item config:name="VisibleTop" config:type="long">23142</config:config-item>
<config:config-item config:name="VisibleRight" config:type="long">23439</config:config-item>
<config:config-item config:name="VisibleBottom" config:type="long">44591</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">1</config:config-item>
<config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item>
@@ -69,7 +69,7 @@
<config:config-item config:name="InvertBorderSpacing" config:type="boolean">false</config:config-item>
<config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item>
<config:config-item config:name="TabsRelativeToIndent" config:type="boolean">true</config:config-item>
<config:config-item config:name="Rsid" config:type="int">5712891</config:config-item>
<config:config-item config:name="Rsid" config:type="int">5723984</config:config-item>
<config:config-item config:name="PrintProspectRTL" config:type="boolean">false</config:config-item>
<config:config-item config:name="PrintEmptyPages" config:type="boolean">false</config:config-item>
<config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item>
@@ -465,7 +465,22 @@
<style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
<style:text-properties style:font-name="Liberation Sans2" fo:font-size="16.1000003814697pt" officeooo:paragraph-rsid="0040040c" style:font-name-asian="DejaVu Sans1" style:font-size-asian="16.1000003814697pt" style:font-name-complex="DejaVu Sans1" style:font-size-complex="16.1000003814697pt"/>
</style:style>
<style:style style:name="P34" style:family="paragraph">
<style:style style:name="P34" style:family="paragraph" style:parent-style-name="Standard">
<style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
<style:text-properties style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="DejaVu Serif1" fo:font-size="9pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal"/>
</style:style>
<style:style style:name="P35" style:family="paragraph" style:parent-style-name="Text_20_body">
<style:text-properties fo:font-size="6pt" officeooo:paragraph-rsid="00575750" style:font-size-asian="6pt" style:font-size-complex="6pt"/>
</style:style>
<style:style style:name="P36" style:family="paragraph" style:parent-style-name="Text_20_body">
<style:paragraph-properties fo:break-before="page"/>
<style:text-properties fo:font-size="6pt" officeooo:paragraph-rsid="00575750" style:font-size-asian="6pt" style:font-size-complex="6pt"/>
</style:style>
<style:style style:name="P37" style:family="paragraph" style:parent-style-name="Heading_20_1">
<style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
<style:text-properties style:font-name="Liberation Sans2" fo:font-size="16.1000003814697pt" officeooo:paragraph-rsid="0040040c" style:font-name-asian="DejaVu Sans1" style:font-size-asian="16.1000003814697pt" style:font-name-complex="DejaVu Sans1" style:font-size-complex="16.1000003814697pt"/>
</style:style>
<style:style style:name="P38" style:family="paragraph">
<style:paragraph-properties fo:text-align="start"/>
<style:text-properties style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="DejaVu Serif1" fo:font-size="9pt" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal"/>
</style:style>
@@ -582,7 +597,8 @@
<text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
</text:sequence-decls>
<text:p text:style-name="Text_20_body"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;mandate in records&quot;&gt;</text:placeholder></text:p>
<text:p text:style-name="P22"><text:placeholder text:placeholder-type="text">&lt;set_lang(mandate.party.lang.code if mandate.party.lang else &apos;en&apos;)&gt;</text:placeholder><text:placeholder text:placeholder-type="text">&lt;mandate.set_lang(mandate.party.lang.code if mandate.party.lang else &apos;en&apos;)&gt;</text:placeholder></text:p>
<text:p text:style-name="P36"><text:placeholder text:placeholder-type="text">&lt;replace text:p=&quot;set_lang(mandate.party.lang.code if mandate.party.lang else &apos;en&apos;)&quot;&gt;</text:placeholder></text:p>
<text:p text:style-name="P35"><text:placeholder text:placeholder-type="text">&lt;replace text:p=&quot;mandate.set_lang(mandate.party.lang.code if mandate.party.lang else &apos;en&apos;)&quot;&gt;</text:placeholder></text:p>
<table:table table:name="Table2" table:style-name="Table2">
<table:table-column table:style-name="Table2.A"/>
<table:table-row>
@@ -819,12 +835,12 @@
<table:table-cell table:style-name="Table1.B23" office:value-type="string">
<text:p text:style-name="P27"><text:placeholder text:placeholder-type="text">&lt;choose test=&quot;&quot;&gt;</text:placeholder></text:p>
<text:p text:style-name="P28"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;mandate.type == &apos;recurrent&apos;&quot;&gt;</text:placeholder></text:p>
<text:p text:style-name="P31"><draw:control text:anchor-type="as-char" draw:z-index="0" draw:style-name="gr1" draw:text-style-name="P34" svg:width="0.1579in" svg:height="0.1579in" draw:control="control1">
<text:p text:style-name="P31"><draw:control text:anchor-type="as-char" draw:z-index="0" draw:style-name="gr1" draw:text-style-name="P38" svg:width="0.1579in" svg:height="0.1579in" draw:control="control1">
<svg:title> </svg:title>
</draw:control><text:span text:style-name="T3">Recurrent payment</text:span></text:p>
<text:p text:style-name="P32"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
<text:p text:style-name="P25"><text:placeholder text:placeholder-type="text">&lt;otherwise test=&quot;&quot;&gt;</text:placeholder></text:p>
<text:p text:style-name="P28"><text:span text:style-name="T2"><draw:control text:anchor-type="as-char" draw:z-index="1" draw:style-name="gr2" draw:text-style-name="P34" svg:width="0.1579in" svg:height="0.1579in" draw:control="control2">
<text:p text:style-name="P28"><text:span text:style-name="T2"><draw:control text:anchor-type="as-char" draw:z-index="1" draw:style-name="gr2" draw:text-style-name="P38" svg:width="0.1579in" svg:height="0.1579in" draw:control="control2">
<svg:title> </svg:title>
</draw:control></text:span><text:span text:style-name="T2">Recurrent payment</text:span></text:p>
<text:p text:style-name="P25"><text:placeholder text:placeholder-type="text">&lt;/otherwise&gt;</text:placeholder></text:p>
@@ -833,12 +849,12 @@
<table:table-cell table:style-name="Table1.B1" office:value-type="string">
<text:p text:style-name="P23"><text:placeholder text:placeholder-type="text">&lt;choose test=&quot;&quot;&gt;</text:placeholder></text:p>
<text:p text:style-name="P26"><text:placeholder text:placeholder-type="text">&lt;when test=&quot;mandate.type == &apos;one-off&apos;&quot;&gt;</text:placeholder></text:p>
<text:p text:style-name="P29"><text:span text:style-name="T2"><draw:control text:anchor-type="as-char" draw:z-index="2" draw:style-name="gr2" draw:text-style-name="P34" svg:width="0.1579in" svg:height="0.1579in" draw:control="control3">
<text:p text:style-name="P29"><text:span text:style-name="T2"><draw:control text:anchor-type="as-char" draw:z-index="2" draw:style-name="gr2" draw:text-style-name="P38" svg:width="0.1579in" svg:height="0.1579in" draw:control="control3">
<svg:title> </svg:title>
</draw:control></text:span><text:span text:style-name="T2">One-off payment</text:span></text:p>
<text:p text:style-name="P26"><text:placeholder text:placeholder-type="text">&lt;/when&gt;</text:placeholder></text:p>
<text:p text:style-name="P26"><text:placeholder text:placeholder-type="text">&lt;otherwise test=&quot;mandate.type == &apos;recurrent&apos;&quot;&gt;</text:placeholder></text:p>
<text:p text:style-name="P29"><text:span text:style-name="T2"><draw:control text:anchor-type="as-char" draw:z-index="3" draw:style-name="gr1" draw:text-style-name="P34" svg:width="0.1579in" svg:height="0.1579in" draw:control="control4">
<text:p text:style-name="P29"><text:span text:style-name="T2"><draw:control text:anchor-type="as-char" draw:z-index="3" draw:style-name="gr1" draw:text-style-name="P38" svg:width="0.1579in" svg:height="0.1579in" draw:control="control4">
<svg:title> </svg:title>
</draw:control></text:span><text:span text:style-name="T2">One-off payment</text:span></text:p>
<text:p text:style-name="P26"><text:placeholder text:placeholder-type="text">&lt;/otherwise&gt;</text:placeholder></text:p>