diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml index e6b0cb9eafede9dbfb7db9603ea967665315654d..16a215dc39b2ce24edf05fc96472b59ddbeea4a2 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml @@ -251,7 +251,7 @@ AAA=</string> </value> <style:paragraph-properties fo:text-align=\'start\' style:justify-single-word=\'false\'/>\n </style:style>\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 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 @@ -494,9 +494,8 @@ AAA=</string> </value> tal:attributes=\'text:style-name style_name\'>ref</text:p>\n </table:table-cell>\n <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n - <text:p text:style-name=\'Table_20_Contents\'\n - tal:content=\'python:line_dict["description"]\'\n - tal:attributes=\'text:style-name left_style_name\'>desc</text:p>\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:replace="line"/><text:line-break tal:condition="not:repeat/line/end"/></tal:block></text:p>\n </table:table-cell>\n <table:table-cell table:style-name=\'Tableau1.A3\'\n office:value-type=\'float\'\n @@ -667,7 +666,9 @@ AAA=</string> </value> </table:table-row>\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 - <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:covered-table-cell/>\n <table:covered-table-cell/>\n diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 27384974685c11f34eb44981eec6c97f035971e8..2ae9f6c7cb0c0df9f4a24d37ce337efa56c061b7 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -439 \ No newline at end of file +441 \ No newline at end of file