From d3db434867f284dd1b8b5a1a6c65c57e63df7dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Fri, 11 Dec 2009 17:00:27 +0000 Subject: [PATCH] Don't use a fixed size for the "Notes" box, unless the box is empty git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31257 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_trade/Order_viewAsODT.xml | 8 +++++--- .../portal_skins/erp5_trade/PackingList_viewAsODT.xml | 3 ++- bt5/erp5_trade/bt/revision | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) 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 6aa770e4f4..d7e52cbc3b 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 @@ -226,9 +226,10 @@ AAA=</string> </value> <style:style style:family=\'table-cell\' style:name=\'Tableau3.E6\'>\n <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'0.018cm solid #000000\' fo:border-top=\'0.018cm solid #000000\' fo:border-left=\'none\' fo:border-bottom=\'none\' style:vertical-align=\'middle\'/>\n </style:style>\n - <style:style style:family=\'table-row\' style:name=\'Tableau3.7\'>\n - <style:table-row-properties style:row-height=\'1.499cm\'/>\n + <style:style style:family=\'table-row\' style:name=\'EmptyTableau3.7\'>\n + <style:table-row-properties style:row-height=\'1.499cm\'/> \n </style:style>\n + <style:style style:family=\'table-row\' style:name=\'DynamicTableau3.7\'/>\n <style:style style:family=\'table-cell\' style:name=\'Tableau3.A7\'>\n <style:table-cell-properties fo:border-left=\'0.018cm solid #000000\' fo:border-right=\'0.018cm solid #000000\' fo:border-bottom=\'0.018cm solid #000000\' fo:padding=\'0.097cm\' fo:border-top=\'none\'/>\n </style:style>\n @@ -681,7 +682,8 @@ AAA=</string> </value> <text:p text:style-name=\'Table_20_Contents\'/>\n </table:table-cell>\n </table:table-row>\n - <table:table-row table:style-name=\'Tableau3.7\'>\n + <table:table-row table:style-name=\'EmptyTableau3.7\'\n + tal:attributes="table:style-name python: data_dict[\'description\'] and \'DynamicTableau3.7\' or \'EmptyTableau3.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: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 diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml index 2dd4a741bb..dbcb524188 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml @@ -600,7 +600,8 @@ AAA=</string> </value> <text:p text:style-name=\'Table_20_Contents\'/>\n </table:table-cell>\n </table:table-row>\n - <table:table-row table:style-name=\'Tableau3.7\'>\n + <table:table-row table:style-name=\'Tableau3.7\'\n + tal:attributes="table:style-name python: data_dict[\'description\'] and \'DynamicTableau3.7\' or \'EmptyTableau3.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: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 diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 0a91b8cce0..a5a504bd0e 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -797 \ No newline at end of file +799 \ No newline at end of file -- 2.30.9