[Erp5-report] r21737 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Jun 23 11:46:36 CEST 2008
Author: nicolas
Date: Mon Jun 23 11:46:29 2008
New Revision: 21737
URL: http://svn.erp5.org?rev=21737&view=rev
Log:
Display Header Data in a table
Modified:
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml
erp5/trunk/bt5/erp5_trade/bt/revision
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml?rev=21737&r1=21736&r2=21737&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml Mon Jun 23 11:46:29 2008
@@ -126,7 +126,7 @@
</style:style>\n
<style:style style:name="List" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="list"/>\n
<style:style style:name="Header" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="extra" style:master-page-name="">\n
- <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" fo:text-align="end" style:justify-single-word="false" style:register-true="true" style:page-number="auto" fo:background-color="transparent" style:shadow="none" fo:keep-with-next="always" style:vertical-align="auto">\n
+ <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" fo:text-align="start" style:justify-single-word="false" style:register-true="true" style:page-number="auto" fo:background-color="transparent" style:shadow="none" fo:keep-with-next="always" style:vertical-align="auto">\n
<style:tab-stops/>\n
<style:background-image/>\n
</style:paragraph-properties>\n
@@ -258,6 +258,27 @@
<text:linenumbering-configuration text:number-lines="false" text:offset="0.499cm" style:num-format="1" text:number-position="left" text:increment="5"/>\n
</office:styles>\n
<office:automatic-styles>\n
+ <style:style style:name="Tableau4" style:family="table">\n
+ <style:table-properties style:width="19.001cm" table:align="margins" style:shadow="none"/>\n
+ </style:style>\n
+ <style:style style:name="Tableau4.A" style:family="table-column">\n
+ <style:table-column-properties style:column-width="6.334cm" style:rel-column-width="21845*"/>\n
+ </style:style>\n
+ <style:style style:name="Tableau4.B" style:family="table-column">\n
+ <style:table-column-properties style:column-width="6.334cm" style:rel-column-width="21844*"/>\n
+ </style:style>\n
+ <style:style style:name="Tableau4.1" style:family="table-row">\n
+ <style:table-row-properties style:min-row-height="1.723cm"/>\n
+ </style:style>\n
+ <style:style style:name="Tableau4.A1" style:family="table-cell">\n
+ <style:table-cell-properties fo:padding="0.097cm" fo:border="none"/>\n
+ </style:style>\n
+ <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Table_20_Contents">\n
+ <style:text-properties style:font-name-asian="DejaVu Sans1" style:font-size-asian="14pt" style:font-name-complex="DejaVu Sans1" style:font-size-complex="14pt"/>\n
+ </style:style>\n
+ <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Header_20_right">\n
+ <style:text-properties style:font-name-asian="DejaVu Sans1" style:font-size-asian="14pt" style:font-name-complex="DejaVu Sans1" style:font-size-complex="14pt"/>\n
+ </style:style>\n
<style:style style:name="fr1" style:family="graphic" style:parent-style-name="Header_20_Image">\n
<style:graphic-properties style:vertical-pos="top" style:vertical-rel="paragraph" style:horizontal-pos="left" style:horizontal-rel="paragraph" style:mirror="none" fo:clip="rect(0cm 0cm 0cm 0cm)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard"/>\n
</style:style>\n
@@ -295,38 +316,67 @@
image_path python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_path\'] or data_dict[\'source_decision_image_path\'];\n
image_width python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_width\'] or data_dict[\'source_decision_image_width\'];\n
image_height python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_height\'] or data_dict[\'source_decision_image_height\']">\n
- <text:p text:style-name="Header">\n
- <office:include_img tal:condition="image_path"\n
- tal:attributes="path image_path;\n
- draw:style-name string:fr1;\n
- draw:z-index string:0;\n
- text:anchor-type string:paragraph;\n
- width image_width;\n
- height image_height"/>\n
- </text:p>\n
- <text:p text:style-name="Header"\n
- tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_title\'] or data_dict[\'source_decision_title\']">\n
- </text:p>\n
- <text:p text:style-name="Header"\n
- tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_address\'] or data_dict[\'source_decision_address\']">\n
- </text:p>\n
- <text:p text:style-name="Header"\n
- tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_telfax\'] or data_dict[\'source_decision_telfax\']">\n
- </text:p>\n
- <text:p text:style-name="Header"\n
- tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_email\'] or data_dict[\'source_decision_email\']">\n
- </text:p>\n
- <text:p text:style-name="Header"\n
- tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_vatid\'] or data_dict[\'source_decision_vatid\']">\n
- </text:p>\n
- <text:p text:style-name="Header_20_Title"\n
- tal:content="en_title">\n
- </text:p>\n
- <text:p text:style-name="Header_20_right"\n
- tal:content="my_title">\n
- </text:p>\n
- <text:p text:style-name="Header_20_right">\n
- <text:p tal:replace="my_page"/><text:page-number text:select-page="current">1</text:page-number><text:p tal:replace="my_of"/><text:page-count>1</text:page-count></text:p>\n
+ <table:table table:name="Tableau4" table:style-name="Tableau4">\n
+ <table:table-column table:style-name="Tableau4.A"/>\n
+ <table:table-column table:style-name="Tableau4.B"/>\n
+ <table:table-column table:style-name="Tableau4.A"/>\n
+ <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
+ maxwidth="6cm"\n
+ maxheigth="2cm"\n
+ tal:attributes="path image_path;\n
+ draw:style-name string:fr1;\n
+ draw:z-index string:0;\n
+ text:anchor-type string:paragraph;\n
+ width image_width;\n
+ height image_height"/>\n
+ </text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n
+ <text:p text:style-name="Header"\n
+ tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_title\'] or data_dict[\'source_decision_title\']">\n
+ </text:p>\n
+ <text:p text:style-name="Header"\n
+ tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_address\'] or data_dict[\'source_decision_address\']">\n
+ </text:p>\n
+ <text:p text:style-name="Header"\n
+ tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_telfax\'] or data_dict[\'source_decision_telfax\']">\n
+ </text:p>\n
+ <text:p text:style-name="Header"\n
+ tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_email\'] or data_dict[\'source_decision_email\']">\n
+ </text:p>\n
+ <text:p text:style-name="Header"\n
+ tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_vatid\'] or data_dict[\'source_decision_vatid\']">\n
+ </text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n
+ <text:p text:style-name="P1"/>\n
+ </table:table-cell>\n
+ </table:table-row>\n
+ <table:table-row>\n
+ <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n
+ <text:p text:style-name="P1"/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n
+ <text:p text:style-name="P1"/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n
+ <text:p text:style-name="Header_20_Title"\n
+ tal:content="en_title">\n
+ </text:p>\n
+ <text:p text:style-name="Header_20_right"\n
+ tal:content="my_title">\n
+ </text:p>\n
+ <text:p text:style-name="Header_20_right">\n
+ <text:p tal:replace="my_page"/>\n
+ <text:page-number text:select-page="current">1</text:page-number>\n
+ <text:p tal:replace="my_of"/><text:page-count>1</text:page-count>\n
+ </text:p>\n
+ </table:table-cell>\n
+ </table:table-row>\n
+ </table:table>\n
</style:header>\n
<style:footer>\n
<text:p text:style-name="Footer">Generated with ERP5 \xe2\x80\x93 Open Source ERP suite (www.erp5.org)</text:p>\n
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml?rev=21737&r1=21736&r2=21737&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml Mon Jun 23 11:46:29 2008
@@ -126,7 +126,7 @@
</style:style>\n
<style:style style:name="List" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="list"/>\n
<style:style style:name="Header" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="extra" style:master-page-name="">\n
- <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" fo:text-align="end" style:justify-single-word="false" style:register-true="true" style:page-number="auto" fo:background-color="transparent" style:shadow="none" fo:keep-with-next="always" style:vertical-align="auto">\n
+ <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" fo:text-align="start" style:justify-single-word="false" style:register-true="true" style:page-number="auto" fo:background-color="transparent" style:shadow="none" fo:keep-with-next="always" style:vertical-align="auto">\n
<style:tab-stops/>\n
<style:background-image/>\n
</style:paragraph-properties>\n
@@ -258,6 +258,27 @@
<text:linenumbering-configuration text:number-lines="false" text:offset="0.499cm" style:num-format="1" text:number-position="left" text:increment="5"/>\n
</office:styles>\n
<office:automatic-styles>\n
+ <style:style style:name="Tableau4" style:family="table">\n
+ <style:table-properties style:width="19.001cm" table:align="margins" style:shadow="none"/>\n
+ </style:style>\n
+ <style:style style:name="Tableau4.A" style:family="table-column">\n
+ <style:table-column-properties style:column-width="6.334cm" style:rel-column-width="21845*"/>\n
+ </style:style>\n
+ <style:style style:name="Tableau4.B" style:family="table-column">\n
+ <style:table-column-properties style:column-width="6.334cm" style:rel-column-width="21844*"/>\n
+ </style:style>\n
+ <style:style style:name="Tableau4.1" style:family="table-row">\n
+ <style:table-row-properties style:min-row-height="1.723cm"/>\n
+ </style:style>\n
+ <style:style style:name="Tableau4.A1" style:family="table-cell">\n
+ <style:table-cell-properties fo:padding="0.097cm" fo:border="none"/>\n
+ </style:style>\n
+ <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Table_20_Contents">\n
+ <style:text-properties style:font-name-asian="DejaVu Sans1" style:font-size-asian="14pt" style:font-name-complex="DejaVu Sans1" style:font-size-complex="14pt"/>\n
+ </style:style>\n
+ <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Header_20_right">\n
+ <style:text-properties style:font-name-asian="DejaVu Sans1" style:font-size-asian="14pt" style:font-name-complex="DejaVu Sans1" style:font-size-complex="14pt"/>\n
+ </style:style>\n
<style:style style:name="fr1" style:family="graphic" style:parent-style-name="Header_20_Image">\n
<style:graphic-properties style:vertical-pos="top" style:vertical-rel="paragraph" style:horizontal-pos="left" style:horizontal-rel="paragraph" style:mirror="none" fo:clip="rect(0cm 0cm 0cm 0cm)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard"/>\n
</style:style>\n
@@ -295,38 +316,67 @@
image_path python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_path\'] or data_dict[\'source_section_image_path\'];\n
image_width python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_width\'] or data_dict[\'source_section_image_width\'];\n
image_height python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_image_height\'] or data_dict[\'source_section_image_height\']">\n
- <text:p text:style-name="Header">\n
- <office:include_img tal:condition="image_path"\n
- tal:attributes="path image_path;\n
- draw:style-name string:fr1;\n
- draw:z-index string:0;\n
- text:anchor-type string:paragraph;\n
- width image_width;\n
- height image_height"/>\n
- </text:p>\n
- <text:p text:style-name="Header"\n
- tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_title\'] or data_dict[\'source_section_title\']">\n
- </text:p>\n
- <text:p text:style-name="Header"\n
- tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_address\'] or data_dict[\'source_section_address\']">\n
- </text:p>\n
- <text:p text:style-name="Header"\n
- tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_telfax\'] or data_dict[\'source_section_telfax\']">\n
- </text:p>\n
- <text:p text:style-name="Header"\n
- tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_email\'] or data_dict[\'source_section_email\']">\n
- </text:p>\n
- <text:p text:style-name="Header"\n
- tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_vatid\'] or data_dict[\'source_section_vatid\']">\n
- </text:p>\n
- <text:p text:style-name="Header_20_Title"\n
- tal:content="en_title">\n
- </text:p>\n
- <text:p text:style-name="Header_20_right"\n
- tal:content="my_title">\n
- </text:p>\n
- <text:p text:style-name="Header_20_right">\n
- <text:p tal:replace="my_page"/><text:page-number text:select-page="current">1</text:page-number><text:p tal:replace="my_of"/><text:page-count>1</text:page-count></text:p>\n
+ <table:table table:name="Tableau4" table:style-name="Tableau4">\n
+ <table:table-column table:style-name="Tableau4.A"/>\n
+ <table:table-column table:style-name="Tableau4.B"/>\n
+ <table:table-column table:style-name="Tableau4.A"/>\n
+ <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
+ maxwidth="6cm"\n
+ maxheigth="2cm"\n
+ tal:attributes="path image_path;\n
+ draw:style-name string:fr1;\n
+ draw:z-index string:0;\n
+ text:anchor-type string:paragraph;\n
+ width image_width;\n
+ height image_height"/>\n
+ </text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n
+ <text:p text:style-name="Header"\n
+ tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_title\'] or data_dict[\'source_section_title\']">\n
+ </text:p>\n
+ <text:p text:style-name="Header"\n
+ tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_address\'] or data_dict[\'source_section_address\']">\n
+ </text:p>\n
+ <text:p text:style-name="Header"\n
+ tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_telfax\'] or data_dict[\'source_section_telfax\']">\n
+ </text:p>\n
+ <text:p text:style-name="Header"\n
+ tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_email\'] or data_dict[\'source_section_email\']">\n
+ </text:p>\n
+ <text:p text:style-name="Header"\n
+ tal:content="python: here.getPortalType().startswith(\'Purchase\') and data_dict[\'destination_section_vatid\'] or data_dict[\'source_section_vatid\']">\n
+ </text:p>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n
+ <text:p text:style-name="P1"/>\n
+ </table:table-cell>\n
+ </table:table-row>\n
+ <table:table-row>\n
+ <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n
+ <text:p text:style-name="P1"/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n
+ <text:p text:style-name="P1"/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name="Tableau4.A1" office:value-type="string">\n
+ <text:p text:style-name="Header_20_Title"\n
+ tal:content="en_title">\n
+ </text:p>\n
+ <text:p text:style-name="Header_20_right"\n
+ tal:content="my_title">\n
+ </text:p>\n
+ <text:p text:style-name="Header_20_right">\n
+ <text:p tal:replace="my_page"/>\n
+ <text:page-number text:select-page="current">1</text:page-number>\n
+ <text:p tal:replace="my_of"/><text:page-count>1</text:page-count>\n
+ </text:p>\n
+ </table:table-cell>\n
+ </table:table-row>\n
+ </table:table>\n
</style:header>\n
<style:footer>\n
<text:p text:style-name="Footer">Generated with ERP5 \xe2\x80\x93 Open Source ERP suite (www.erp5.org)</text:p>\n
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=21737&r1=21736&r2=21737&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision Mon Jun 23 11:46:29 2008
@@ -1,1 +1,1 @@
-389
+390
More information about the Erp5-report
mailing list