From c4adaf7cdaabc6d057bcd76243f11020d07e16bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Wed, 23 May 2018 23:14:05 +0200
Subject: [PATCH] Fallback to the default configured language in report

issue7449
review46461002
---
 delivery_note.fodt | 58 ++++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/delivery_note.fodt b/delivery_note.fodt
index 320ebfd021..ff27aaba31 100644
--- a/delivery_note.fodt
+++ b/delivery_note.fodt
@@ -1,29 +1,30 @@
 <?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:generator>LibreOffice/5.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-2</meta:generator><meta:creation-date>2008-06-07T15:29:02</meta:creation-date><dc:date>2009-03-26T18:33:13</dc:date><meta:editing-cycles>1</meta:editing-cycles><meta:editing-duration>PT0S</meta:editing-duration><meta:document-statistic meta:table-count="1" meta:image-count="0" meta:object-count="0" meta:page-count="2" meta:paragraph-count="27" meta:word-count="81" meta:character-count="1082" meta:non-whitespace-character-count="1028"/><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/5.4.5.1$Linux_X86_64 LibreOffice_project/40m0$Build-1</meta:generator><meta:creation-date>2008-06-07T15:29:02</meta:creation-date><dc:date>2009-03-26T18:33:13</dc:date><meta:editing-cycles>1</meta:editing-cycles><meta:editing-duration>PT0S</meta:editing-duration><meta:document-statistic meta:table-count="1" meta:image-count="0" meta:object-count="0" meta:page-count="2" meta:paragraph-count="27" meta:word-count="79" meta:character-count="1062" meta:non-whitespace-character-count="1010"/><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">29012</config:config-item>
+   <config:config-item config:name="ViewAreaTop" config:type="long">30762</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">23440</config:config-item>
-   <config:config-item config:name="ViewAreaHeight" config:type="long">21451</config:config-item>
+   <config:config-item config:name="ViewAreaWidth" config:type="long">29300</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="long">27571</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">14501</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">37947</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">17431</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">36973</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">29012</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">50461</config:config-item>
+     <config:config-item config:name="VisibleTop" config:type="long">30762</config:config-item>
+     <config:config-item config:name="VisibleRight" config:type="long">29298</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">58332</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>
      <config:config-item config:name="ZoomFactor" config:type="short">100</config:config-item>
      <config:config-item config:name="IsSelectedFrame" config:type="boolean">false</config:config-item>
+     <config:config-item config:name="AnchoredTextOverflowLegacy" config:type="boolean">false</config:config-item>
     </config:config-item-map-entry>
    </config:config-item-map-indexed>
   </config:config-item-set>
@@ -59,6 +60,7 @@
    <config:config-item config:name="IsLabelDocument" config:type="boolean">false</config:config-item>
    <config:config-item config:name="PrinterName" config:type="string"/>
    <config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="MsWordCompTrailingBlanks" config:type="boolean">false</config:config-item>
    <config:config-item config:name="IgnoreFirstLineIndentInNumbering" config:type="boolean">false</config:config-item>
    <config:config-item config:name="UpdateFromTemplate" config:type="boolean">true</config:config-item>
    <config:config-item config:name="PrintBlackFonts" config:type="boolean">false</config:config-item>
@@ -69,7 +71,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">2676851</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">2803237</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">true</config:config-item>
    <config:config-item config:name="ApplyUserData" config:type="boolean">false</config:config-item>
@@ -132,7 +134,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.1181in" draw:shadow-offset-y="0.1181in" draw:start-line-spacing-horizontal="0.1114in" draw:start-line-spacing-vertical="0.1114in" draw:end-line-spacing-horizontal="0.1114in" draw:end-line-spacing-vertical="0.1114in" 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" 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"/>
@@ -347,24 +349,24 @@
    <style:paragraph-properties fo:margin-left="4.4409in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false"/>
    <style:text-properties style:font-name="Liberation Sans1"/>
   </style:style>
-  <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Standard" style:master-page-name="">
+  <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-left="4.4409in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false"/>
+   <style:text-properties style:font-name="Liberation Sans1" officeooo:paragraph-rsid="0028d873"/>
+  </style:style>
+  <style:style style:name="P17" style:family="paragraph" style:parent-style-name="Standard" style:master-page-name="">
    <style:paragraph-properties fo:margin-left="4.4409in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false" style:page-number="auto" fo:break-before="page"/>
    <style:text-properties style:font-name="Liberation Sans1"/>
   </style:style>
-  <style:style style:name="P17" 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:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color"/>
-  </style:style>
-  <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Standard">
-   <style:text-properties officeooo:paragraph-rsid="001d64ef"/>
-  </style:style>
-  <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Standard" style:master-page-name="">
+  <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Standard" style:master-page-name="">
    <style:paragraph-properties fo:margin-left="4.4409in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false" style:page-number="auto" fo:break-before="page"/>
    <style:text-properties style:font-name="Liberation Sans1" officeooo:paragraph-rsid="0028d873"/>
   </style:style>
+  <style:style style:name="P19" 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:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color"/>
+  </style:style>
   <style:style style:name="P20" style:family="paragraph" style:parent-style-name="Standard">
-   <style:paragraph-properties fo:margin-left="4.4409in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false"/>
-   <style:text-properties style:font-name="Liberation Sans1" officeooo:paragraph-rsid="0028d873"/>
+   <style:text-properties officeooo:paragraph-rsid="001d64ef"/>
   </style:style>
   <style:style style:name="T1" style:family="text">
    <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
@@ -414,13 +416,13 @@
     <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
    </text:sequence-decls>
    <text:p text:style-name="P14"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;shipment in records&quot;&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P19"><text:placeholder text:placeholder-type="text">&lt;replace text:p=&quot;set_lang(shipment.delivery_address.party.lang and shipment.delivery_address.party.lang.code or &apos;en&apos;)&quot;&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P20"><text:placeholder text:placeholder-type="text">&lt;replace text:p=&quot;shipment.set_lang(shipment.delivery_address.party.lang and shipment.delivery_address.party.lang.code or &apos;en&apos;)&quot;&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P20"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in shipment.delivery_address.full_address.split(&apos;\n&apos;)&quot;&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P18"><text:placeholder text:placeholder-type="text">&lt;replace text:p=&quot;set_lang(shipment.delivery_address.party.lang)&quot;&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P16"><text:placeholder text:placeholder-type="text">&lt;replace text:p=&quot;shipment.set_lang(shipment.delivery_address.party.lang)&quot;&gt;</text:placeholder></text:p>
+   <text:p text:style-name="P16"><text:placeholder text:placeholder-type="text">&lt;for each=&quot;line in shipment.delivery_address.full_address.split(&apos;\n&apos;)&quot;&gt;</text:placeholder></text:p>
    <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;line&gt;</text:placeholder></text:p>
    <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
-   <text:p text:style-name="P17">Delivery Note</text:p>
-   <text:p text:style-name="P18"><text:span text:style-name="T1">Shipment Number:</text:span> <text:placeholder text:placeholder-type="text">&lt;shipment.number&gt;</text:placeholder><text:span text:style-name="T2"><text:line-break/></text:span><text:span text:style-name="T1">Customer Code:</text:span><text:span text:style-name="T2"> </text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text">&lt;shipment.customer.code&gt;</text:placeholder></text:span><text:span text:style-name="T2"><text:line-break/></text:span><text:span text:style-name="T1">Reference:</text:span><text:span text:style-name="T2"> </text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text">&lt;shipment.origins or &apos;&apos;&gt;</text:placeholder></text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text">&lt;&apos;, &apos; if (shipment.origins and shipment.reference) else &apos;&apos;&gt;</text:placeholder></text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text">&lt;shipment.reference or &apos;&apos;&gt;</text:placeholder></text:span><text:span text:style-name="T2"><text:line-break/></text:span><text:span text:style-name="T1">Date: </text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text">&lt;format_date(shipment.effective_date and shipment.effective_date or datetime.datetime.today(), shipment.delivery_address.party.lang)&gt;</text:placeholder></text:span></text:p>
+   <text:p text:style-name="P19">Delivery Note</text:p>
+   <text:p text:style-name="P20"><text:span text:style-name="T1">Shipment Number:</text:span> <text:placeholder text:placeholder-type="text">&lt;shipment.number&gt;</text:placeholder><text:span text:style-name="T2"><text:line-break/></text:span><text:span text:style-name="T1">Customer Code:</text:span><text:span text:style-name="T2"> </text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text">&lt;shipment.customer.code&gt;</text:placeholder></text:span><text:span text:style-name="T2"><text:line-break/></text:span><text:span text:style-name="T1">Reference:</text:span><text:span text:style-name="T2"> </text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text">&lt;shipment.origins or &apos;&apos;&gt;</text:placeholder></text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text">&lt;&apos;, &apos; if (shipment.origins and shipment.reference) else &apos;&apos;&gt;</text:placeholder></text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text">&lt;shipment.reference or &apos;&apos;&gt;</text:placeholder></text:span><text:span text:style-name="T2"><text:line-break/></text:span><text:span text:style-name="T1">Date: </text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text">&lt;format_date(shipment.effective_date and shipment.effective_date or datetime.datetime.today(), shipment.delivery_address.party.lang)&gt;</text:placeholder></text:span></text:p>
    <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"/>
@@ -445,7 +447,7 @@
       <text:p text:style-name="P13"><text:placeholder text:placeholder-type="text">&lt;move.product.rec_name&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Table1.B3" office:value-type="string">
-      <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text">&lt;format_number(move.quantity, shipment.delivery_address.party.lang, digits=move.unit_digits)&gt;</text:placeholder> <text:placeholder text:placeholder-type="text">&lt;move.uom.symbol&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text">&lt;format_number(move.quantity, shipment.delivery_address.party.lang, digits=move.unit_digits)&gt;</text:placeholder><text:s/><text:placeholder text:placeholder-type="text">&lt;move.uom.symbol&gt;</text:placeholder></text:p>
      </table:table-cell>
     </table:table-row>
     <table:table-row>