Commit 3ae8036c authored by Jérome Perrin's avatar Jérome Perrin

Use new Order_getODTDataDict to support line break on descriptions

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22682 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 323d9130
...@@ -251,7 +251,7 @@ AAA=</string> </value> ...@@ -251,7 +251,7 @@ AAA=</string> </value>
<style:paragraph-properties fo:text-align=\'start\' style:justify-single-word=\'false\'/>\n <style:paragraph-properties fo:text-align=\'start\' style:justify-single-word=\'false\'/>\n
</style:style>\n </style:style>\n
<style:style style:parent-style-name=\'Table_20_Contents\' style:family=\'paragraph\' style:name=\'P3\'>\n <style:style style:parent-style-name=\'Table_20_Contents\' style:family=\'paragraph\' style:name=\'P3\'>\n
<style:paragraph-properties fo:text-align=\'justify\' style:justify-single-word=\'false\'/>\n <style:paragraph-properties fo:text-align=\'left\' style:justify-single-word=\'false\'/>\n
</style:style>\n </style:style>\n
<style:style style:parent-style-name=\'Text_20_body\' style:family=\'paragraph\' style:name=\'P4\'>\n <style:style style:parent-style-name=\'Text_20_body\' style:family=\'paragraph\' style:name=\'P4\'>\n
<style:text-properties style:font-size-complex=\'6pt\' style:font-size-asian=\'6pt\' style:font-weight-complex=\'normal\' style:font-weight-asian=\'normal\' fo:font-size=\'6pt\' fo:font-weight=\'normal\'/>\n <style:text-properties style:font-size-complex=\'6pt\' style:font-size-asian=\'6pt\' style:font-weight-complex=\'normal\' style:font-weight-asian=\'normal\' fo:font-size=\'6pt\' fo:font-weight=\'normal\'/>\n
...@@ -494,9 +494,8 @@ AAA=</string> </value> ...@@ -494,9 +494,8 @@ AAA=</string> </value>
tal:attributes=\'text:style-name style_name\'>ref</text:p>\n tal:attributes=\'text:style-name style_name\'>ref</text:p>\n
</table:table-cell>\n </table:table-cell>\n
<table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
<text:p text:style-name=\'Table_20_Contents\'\n <text:p text:style-name=\'Table_20_Contents\' tal:attributes="text:style-name left_style_name"><tal:block tal:repeat="line line_dict/description"><tal:block\n
tal:content=\'python:line_dict["description"]\'\n tal:replace="line"/><text:line-break tal:condition="not:repeat/line/end"/></tal:block></text:p>\n
tal:attributes=\'text:style-name left_style_name\'>desc</text:p>\n
</table:table-cell>\n </table:table-cell>\n
<table:table-cell table:style-name=\'Tableau1.A3\'\n <table:table-cell table:style-name=\'Tableau1.A3\'\n
office:value-type=\'float\'\n office:value-type=\'float\'\n
...@@ -667,7 +666,9 @@ AAA=</string> </value> ...@@ -667,7 +666,9 @@ AAA=</string> </value>
</table:table-row>\n </table:table-row>\n
<table:table-row table:style-name=\'Tableau3.7\'>\n <table:table-row table:style-name=\'Tableau3.7\'>\n
<table:table-cell table:style-name=\'Tableau3.A7\' table:number-columns-spanned=\'5\' office:value-type=\'string\'>\n <table:table-cell table:style-name=\'Tableau3.A7\' table:number-columns-spanned=\'5\' office:value-type=\'string\'>\n
<text:p text:style-name=\'P3\' tal:content=\'python: data_dict["description"]\'>my_description</text:p>\n <text:p text:style-name=\'P3\'><tal:block tal:repeat="line data_dict/description"><tal:block\n
tal:replace="line"/><text:line-break tal:condition="not:repeat/line/end"/></tal:block>\n
</text:p>\n
</table:table-cell>\n </table:table-cell>\n
<table:covered-table-cell/>\n <table:covered-table-cell/>\n
<table:covered-table-cell/>\n <table:covered-table-cell/>\n
......
439 441
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment