- 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

bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewAsODT.xml

@@ -372,7 +372,7 @@ AAA=</string> </value>
                           </table:table-cell>\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
-                                    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-row>\n
                         <table:table-row table:style-name=\'Tableau2.E1.1\'>\n

bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewAsODTStyles.xml

@@ -53,6 +53,12 @@ AAA=</string> </value>
               </object>
             </value>
         </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
@@ -330,7 +336,7 @@ AAA=</string> </value>
           <table:table-row table:style-name="Tableau4.1">\n
             <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\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
                                     maxheigth="2cm"\n
                                     tal:attributes="path image_path;\n

bt5/erp5_invoicing/bt/revision

-120
+121
\ No newline at end of file

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODT.xml

@@ -361,7 +361,7 @@ AAA=</string> </value>
                           </table:table-cell>\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
-                                    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-row>\n
                         <table:table-row table:style-name=\'Tableau2.E1.1\'>\n

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml

@@ -336,7 +336,7 @@ AAA=</string> </value>
           <table:table-row table:style-name="Tableau4.1">\n
             <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\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
                                     maxheigth="2cm"\n
                                     tal:attributes="path image_path;\n

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODT.xml

@@ -358,7 +358,7 @@ AAA=</string> </value>
                           </table:table-cell>\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
-                                    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-row>\n
                         <table:table-row table:style-name=\'Tableau2.E1.1\'>\n

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml

@@ -336,7 +336,7 @@ AAA=</string> </value>
           <table:table-row table:style-name="Tableau4.1">\n
             <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\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
                                     maxheigth="2cm"\n
                                     tal:attributes="path image_path;\n

bt5/erp5_trade/bt/revision

-466
+467
\ No newline at end of file