Commit 127510fd authored by Jérome Perrin's avatar Jérome Perrin

- show creation date as "Document Date"

- support empty images in printouts

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23017 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 7883f9de
...@@ -372,7 +372,7 @@ AAA=</string> </value> ...@@ -372,7 +372,7 @@ AAA=</string> </value>
</table:table-cell>\n </table:table-cell>\n
<table:table-cell table:style-name=\'Tableau2.E1.2.2\' office:value-type=\'string\'>\n <table:table-cell table:style-name=\'Tableau2.E1.2.2\' office:value-type=\'string\'>\n
<text:p text:style-name=\'Table_20_Contents\'\n <text:p text:style-name=\'Table_20_Contents\'\n
tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'start_date\'] or data_dict[\'stop_date\']">start_date</text:p>\n tal:content="data_dict/creation_date">creation date</text:p>\n
</table:table-cell>\n </table:table-cell>\n
</table:table-row>\n </table:table-row>\n
<table:table-row table:style-name=\'Tableau2.E1.1\'>\n <table:table-row table:style-name=\'Tableau2.E1.1\'>\n
......
...@@ -53,6 +53,12 @@ AAA=</string> </value> ...@@ -53,6 +53,12 @@ AAA=</string> </value>
</object> </object>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
...@@ -330,7 +336,7 @@ AAA=</string> </value> ...@@ -330,7 +336,7 @@ AAA=</string> </value>
<table:table-row table:style-name="Tableau4.1">\n <table:table-row table:style-name="Tableau4.1">\n
<table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n
<text:p text:style-name="P1">\n <text:p text:style-name="P1">\n
<office:include_img tal:condition="image_path"\n <office:include_img tal:condition="python: image_path and image_width and image_height"\n
maxwidth="6cm"\n maxwidth="6cm"\n
maxheigth="2cm"\n maxheigth="2cm"\n
tal:attributes="path image_path;\n tal:attributes="path image_path;\n
......
120 121
\ No newline at end of file \ No newline at end of file
...@@ -361,7 +361,7 @@ AAA=</string> </value> ...@@ -361,7 +361,7 @@ AAA=</string> </value>
</table:table-cell>\n </table:table-cell>\n
<table:table-cell table:style-name=\'Tableau2.E1.2.2\' office:value-type=\'string\'>\n <table:table-cell table:style-name=\'Tableau2.E1.2.2\' office:value-type=\'string\'>\n
<text:p text:style-name=\'Table_20_Contents\'\n <text:p text:style-name=\'Table_20_Contents\'\n
tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'start_date\'] or data_dict[\'stop_date\']">start_date</text:p>\n tal:content="data_dict/creation_date">document date</text:p>\n
</table:table-cell>\n </table:table-cell>\n
</table:table-row>\n </table:table-row>\n
<table:table-row table:style-name=\'Tableau2.E1.1\'>\n <table:table-row table:style-name=\'Tableau2.E1.1\'>\n
......
...@@ -336,7 +336,7 @@ AAA=</string> </value> ...@@ -336,7 +336,7 @@ AAA=</string> </value>
<table:table-row table:style-name="Tableau4.1">\n <table:table-row table:style-name="Tableau4.1">\n
<table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n
<text:p text:style-name="P1">\n <text:p text:style-name="P1">\n
<office:include_img tal:condition="image_path"\n <office:include_img tal:condition="python: image_path and image_width and image_height"\n
maxwidth="6cm"\n maxwidth="6cm"\n
maxheigth="2cm"\n maxheigth="2cm"\n
tal:attributes="path image_path;\n tal:attributes="path image_path;\n
......
...@@ -358,7 +358,7 @@ AAA=</string> </value> ...@@ -358,7 +358,7 @@ AAA=</string> </value>
</table:table-cell>\n </table:table-cell>\n
<table:table-cell table:style-name=\'Tableau2.E1.2.2\' office:value-type=\'string\'>\n <table:table-cell table:style-name=\'Tableau2.E1.2.2\' office:value-type=\'string\'>\n
<text:p text:style-name=\'Table_20_Contents\'\n <text:p text:style-name=\'Table_20_Contents\'\n
tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'start_date\'] or data_dict[\'stop_date\']">start_date</text:p>\n tal:content="data_dict/creation_date">document date</text:p>\n
</table:table-cell>\n </table:table-cell>\n
</table:table-row>\n </table:table-row>\n
<table:table-row table:style-name=\'Tableau2.E1.1\'>\n <table:table-row table:style-name=\'Tableau2.E1.1\'>\n
......
...@@ -336,7 +336,7 @@ AAA=</string> </value> ...@@ -336,7 +336,7 @@ AAA=</string> </value>
<table:table-row table:style-name="Tableau4.1">\n <table:table-row table:style-name="Tableau4.1">\n
<table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n
<text:p text:style-name="P1">\n <text:p text:style-name="P1">\n
<office:include_img tal:condition="image_path"\n <office:include_img tal:condition="python: image_path and image_width and image_height"\n
maxwidth="6cm"\n maxwidth="6cm"\n
maxheigth="2cm"\n maxheigth="2cm"\n
tal:attributes="path image_path;\n tal:attributes="path image_path;\n
......
466 467
\ 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