diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewAsODT.xml b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewAsODT.xml index ff0af8d0f1062d60374b2de5e052fc3d21733fe3..3a13df035fc51c1c5a9fbc8f10f0620b2e6ea777 100644 --- a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewAsODT.xml +++ b/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 diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewAsODTStyles.xml b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewAsODTStyles.xml index 6cdfc3865d76189a237c0468f813d2227290c4ef..0d467a898653458ac48e7a43f103190a64cfbc16 100644 --- a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewAsODTStyles.xml +++ b/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 diff --git a/bt5/erp5_invoicing/bt/revision b/bt5/erp5_invoicing/bt/revision index 8bc6583717d617da1f8bf8bbaa7c16c25ef17113..5a396e28e80321703d56c67ec21cc076b67f5d46 100644 --- a/bt5/erp5_invoicing/bt/revision +++ b/bt5/erp5_invoicing/bt/revision @@ -1 +1 @@ -120 \ No newline at end of file +121 \ No newline at end of file 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 7fa02b8bb19519eca4b74e77276f43151a1447cd..436d039c38fd8c639768657c8f861fd1284d136f 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 @@ -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 diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml index 091ffa2b31a777f4c78d6da0f4025faa4bd40de2..b5259dd396e913b08a4a92fe5e67be60ff87b7b9 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml +++ b/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 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 25232b38c32097c7a1666d2d8da876f3adf9ef93..0cc40222ab1a6e3fc7fb11e8adc6f66b9eab6154 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 @@ -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 diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml index c16e564f4f102525ead8bd2c25078cb1c7078d80..ea55e41e1b08fbd68a597877353b810256679e5b 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml +++ b/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 diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index a6d80d584162931833f8d09f1e897fb1bb7bbc3b..02416eb97cd292181088235cae7363a1d11cef60 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -466 \ No newline at end of file +467 \ No newline at end of file