[Erp5-report] r31257 jerome - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/...

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Dec 11 18:00:27 2009
New Revision: 31257

URL: http://svn.erp5.org?rev=31257&view=rev
Log:
Don't use a fixed size for the "Notes" box, unless the box is empty

Modified:
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml?rev=31257&r1=31256&r2=31257&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml [utf8] Fri Dec 11 18:00:27 2009
@@ -226,9 +226,10 @@
     <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>\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 @@
                   <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

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml?rev=31257&r1=31256&r2=31257&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml [utf8] Fri Dec 11 18:00:27 2009
@@ -600,7 +600,8 @@
                   <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

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=31257&r1=31256&r2=31257&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Fri Dec 11 18:00:27 2009
@@ -1,1 +1,1 @@
-797
+799