From 7e73db33ceea854d94ed7621124c5bc5ed49e20f Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Fri, 26 Oct 2007 21:47:34 +0000 Subject: [PATCH] one semicolon is enough. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17220 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_accounting/AccountModule_viewBalanceSheetReport.xml | 2 +- .../erp5_accounting/AccountModule_viewProfitAndLossReport.xml | 2 +- bt5/erp5_accounting/bt/revision | 2 +- .../AccountingTransactionModule_viewBalanceSheetAsSxc.xml | 2 +- .../AccountingTransactionModule_viewProfitAndLossAsSxc.xml | 2 +- bt5/erp5_accounting_l10n_in/bt/revision | 2 +- .../AccountingTransactionModule_viewBalanceSheetAsOO.xml | 2 +- .../AccountingTransactionModule_viewJournalAsOO.xml | 2 +- .../AccountingTransactionModule_viewProfitAndLossAsOO.xml | 2 +- bt5/erp5_accounting_l10n_pl/bt/revision | 2 +- .../portal_skins/erp5_csv_style/form_list.xml | 4 ++-- .../portal_skins/erp5_csv_style/form_view.xml | 4 ++-- bt5/erp5_csv_style/bt/revision | 2 +- .../portal_skins/erp5_dms/Document_convert.xml | 2 +- .../SkinTemplateItem/portal_skins/erp5_dms/Image_convert.xml | 2 +- .../portal_skins/erp5_dms/OOoDocument_getOOoFile.xml | 2 +- .../portal_skins/erp5_dms/OOoDocument_getSnapshot.xml | 2 +- .../portal_skins/erp5_dms/OOoDocument_print.xml | 2 +- bt5/erp5_dms/bt/revision | 2 +- .../SkinTemplateItem/portal_skins/erp5_forge/diff.xml | 2 +- .../SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml | 2 +- bt5/erp5_forge/bt/description | 2 +- .../portal_skins/erp5_html_style/breadcrumb.xml | 2 +- .../portal_skins/erp5_html_style/dialog_master.xml | 2 +- .../erp5_html_style/form_create_relation_dialog.xml | 2 +- .../portal_skins/erp5_html_style/form_html.xml | 2 +- .../portal_skins/erp5_html_style/form_list.xml | 2 +- .../portal_skins/erp5_html_style/global_definition.xml | 2 +- .../portal_skins/erp5_html_style/list_dialog_master.xml | 2 +- .../portal_skins/erp5_html_style/list_master.xml | 2 +- .../portal_skins/erp5_html_style/list_menu_box.xml | 2 +- .../portal_skins/erp5_html_style/main_template.xml | 2 +- .../portal_skins/erp5_html_style/menu_box.xml | 2 +- .../portal_skins/erp5_html_style/navigation_box.xml | 2 +- .../portal_skins/erp5_html_style/report_list.xml | 2 +- .../portal_skins/erp5_html_style/view_dialog_master.xml | 2 +- .../portal_skins/erp5_html_style/view_master.xml | 2 +- .../portal_skins/erp5_html_style/view_menu_box.xml | 2 +- .../portal_skins/erp5_html_style/view_selection_box.xml | 2 +- bt5/erp5_html_style/bt/revision | 2 +- .../portal_skins/erp5_ical_style/template_ical_style.xml | 2 +- bt5/erp5_ical_style/bt/revision | 2 +- .../portal_skins/erp5_mobile_ui/template_erp5_xhtml_style.xml | 2 +- bt5/erp5_mobile/bt/revision | 2 +- .../portal_skins/erp5_ods_style/field_ods_macro.xml | 2 +- .../portal_skins/erp5_ods_style/form_list.xml | 2 +- .../portal_skins/erp5_ods_style/form_view.xml | 2 +- .../portal_skins/erp5_ods_style/listbox_ods_macro.xml | 2 +- .../portal_skins/erp5_ods_style/matrixbox_ods_macro.xml | 2 +- .../portal_skins/erp5_ods_style/report_view.xml | 2 +- .../portal_skins/erp5_ods_style/style_macros.xml | 2 +- bt5/erp5_ods_style/bt/revision | 2 +- .../portal_skins/erp5_odt_style/form_list.xml | 2 +- .../portal_skins/erp5_odt_style/form_view.xml | 2 +- .../portal_skins/erp5_odt_style/listbox_odt_macro.xml | 2 +- .../portal_skins/erp5_odt_style/matrixbox_odt_macro.xml | 2 +- .../portal_skins/erp5_odt_style/report_view.xml | 2 +- bt5/erp5_odt_style/bt/revision | 2 +- .../erp5_project/Project_viewDetailedReportAsOdt.xml | 2 +- .../erp5_project/Project_viewDetailedReportMacro.xml | 2 +- .../RequirementDocument_viewDetailedReportAsOdt.xml | 2 +- .../RequirementDocument_viewOrderMappingReportAsOdt.xml | 2 +- .../RequirementDocument_viewProjectMappingReportAsOdt.xml | 2 +- .../portal_skins/erp5_project/Requirement_odt_view.xml | 2 +- .../TaskReportModule_exportTaskReportListAsiCalendar.xml | 2 +- .../erp5_project/TaskReport_viewDetailedReportAsOdt.xml | 2 +- .../erp5_project_trade/SaleOrder_viewDetailedReportAsOdt.xml | 2 +- .../erp5_project_trade/SaleOrder_viewDetailedReportMacro.xml | 2 +- bt5/erp5_project/bt/revision | 2 +- .../portal_skins/erp5_rss_style/template_rss_style.xml | 2 +- bt5/erp5_rss_style/bt/revision | 2 +- .../portal_skins/erp5_web_default_theme/erp5_web.css.xml | 2 +- .../erp5_web_default_theme/erp5_web_admin_toolbox.css.xml | 2 +- .../erp5_web_default_theme/erp5_web_content.css.xml | 2 +- .../erp5_web_default_theme/erp5_web_editable_content.css.xml | 2 +- .../erp5_web_default_theme/template_erp5_web.css.xml | 2 +- bt5/erp5_web/bt/description | 2 +- bt5/erp5_web/bt/revision | 2 +- product/ERP5/Document/EmailDocument.py | 2 +- .../SkinTemplateItem/portal_skins/erp5_core/Base_download.xml | 2 +- product/ERP5/bootstrap/erp5_core/bt/revision | 2 +- .../portal_skins/erp5_xhtml_style/global_definitions.xml | 2 +- product/ERP5/bootstrap/erp5_xhtml_style/bt/revision | 2 +- product/ERP5/tests/testBase.py | 2 +- product/ERP5OOo/OOoTemplate.py | 4 ++-- product/ERP5OOo/OOoUtils.py | 2 +- product/ERP5OOo/tests/testDms.py | 4 ++-- 87 files changed, 91 insertions(+), 91 deletions(-) diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewBalanceSheetReport.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewBalanceSheetReport.xml index f669ebdb75..1060f17568 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewBalanceSheetReport.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewBalanceSheetReport.xml @@ -93,7 +93,7 @@ dQEAAAAA</string> </value> xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n tal:define=\'at_date request/at_date;\n at_date_previous_period python:modules["DateTime"].DateTime(at_date.year() - 1, at_date.month(), at_date.day());\n from_date python:context.Base_getAccountingPeriodStartDateForSectionCategory(section_category=request["section_category"], date=at_date);\n diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewProfitAndLossReport.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewProfitAndLossReport.xml index bab2c0f84b..db5cb91a70 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewProfitAndLossReport.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewProfitAndLossReport.xml @@ -93,7 +93,7 @@ dQEAAAAA</string> </value> xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n tal:define=\'at_date request/at_date;\n at_date_previous_period python:modules["DateTime"].DateTime(at_date.year() - 1, at_date.month(), at_date.day());\n from_date python:context.Base_getAccountingPeriodStartDateForSectionCategory(section_category=request["section_category"], date=at_date);\n diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index 3b7560b755..95bae2dc25 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -445 \ No newline at end of file +446 \ No newline at end of file diff --git a/bt5/erp5_accounting_l10n_in/SkinTemplateItem/portal_skins/erp5_accounting_l10n_in/AccountingTransactionModule_viewBalanceSheetAsSxc.xml b/bt5/erp5_accounting_l10n_in/SkinTemplateItem/portal_skins/erp5_accounting_l10n_in/AccountingTransactionModule_viewBalanceSheetAsSxc.xml index 854bba1c4d..8793b5763f 100644 --- a/bt5/erp5_accounting_l10n_in/SkinTemplateItem/portal_skins/erp5_accounting_l10n_in/AccountingTransactionModule_viewBalanceSheetAsSxc.xml +++ b/bt5/erp5_accounting_l10n_in/SkinTemplateItem/portal_skins/erp5_accounting_l10n_in/AccountingTransactionModule_viewBalanceSheetAsSxc.xml @@ -63,7 +63,7 @@ TUVUQS1JTkYvbWFuaWZlc3QueG1sUEsFBgAAAAABAAEAQwAAAJoBAAAAAA==</string> </value> <office:document-content xmlns:draw=\'http://openoffice.org/2000/drawing\' xmlns:office=\'http://openoffice.org/2000/office\' xmlns:text=\'http://openoffice.org/2000/text\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'http://openoffice.org/2000/datastyle\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'http://openoffice.org/2000/meta\' xmlns:table=\'http://openoffice.org/2000/table\' xmlns:dr3d=\'http://openoffice.org/2000/dr3d\' xmlns:fo=\'http://www.w3.org/1999/XSL/Format\' xmlns:style=\'http://openoffice.org/2000/style\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'http://openoffice.org/2000/form\' xmlns:script=\'http://openoffice.org/2000/script\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'http://www.w3.org/2000/svg\' xmlns:chart=\'http://openoffice.org/2000/chart\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' office:class=\'spreadsheet\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n office:version=\'1.0\'>\n <office:script/>\n <office:font-decls>\n diff --git a/bt5/erp5_accounting_l10n_in/SkinTemplateItem/portal_skins/erp5_accounting_l10n_in/AccountingTransactionModule_viewProfitAndLossAsSxc.xml b/bt5/erp5_accounting_l10n_in/SkinTemplateItem/portal_skins/erp5_accounting_l10n_in/AccountingTransactionModule_viewProfitAndLossAsSxc.xml index 897cd5a7c7..84b86b042c 100644 --- a/bt5/erp5_accounting_l10n_in/SkinTemplateItem/portal_skins/erp5_accounting_l10n_in/AccountingTransactionModule_viewProfitAndLossAsSxc.xml +++ b/bt5/erp5_accounting_l10n_in/SkinTemplateItem/portal_skins/erp5_accounting_l10n_in/AccountingTransactionModule_viewProfitAndLossAsSxc.xml @@ -63,7 +63,7 @@ dQEAAAAA</string> </value> <office:document-content xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n office:version=\'1.0\'>\n <office:scripts/>\n <office:font-face-decls>\n diff --git a/bt5/erp5_accounting_l10n_in/bt/revision b/bt5/erp5_accounting_l10n_in/bt/revision index c7930257df..301160a930 100644 --- a/bt5/erp5_accounting_l10n_in/bt/revision +++ b/bt5/erp5_accounting_l10n_in/bt/revision @@ -1 +1 @@ -7 \ No newline at end of file +8 \ No newline at end of file diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewBalanceSheetAsOO.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewBalanceSheetAsOO.xml index e3a5460b47..3ddf0727ae 100644 --- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewBalanceSheetAsOO.xml +++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewBalanceSheetAsOO.xml @@ -57,7 +57,7 @@ <office:document-content xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n tal:define="bil python:here.BalanceSheet_calculateCells();"\n office:version=\'1.0\'>\n <office:scripts/>\n diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewJournalAsOO.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewJournalAsOO.xml index 5a948af1f2..25b25e2812 100644 --- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewJournalAsOO.xml +++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewJournalAsOO.xml @@ -63,7 +63,7 @@ <office:document-content xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n tal:define="pl python:here.ProfitAndLoss_calculateCells();"\n office:version=\'1.0\'>\n <office:scripts/>\n diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewProfitAndLossAsOO.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewProfitAndLossAsOO.xml index 976eaccd16..278036d97c 100644 --- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewProfitAndLossAsOO.xml +++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewProfitAndLossAsOO.xml @@ -57,7 +57,7 @@ <office:document-content xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n tal:define="pl python:here.ProfitAndLoss_calculateCells();"\n office:version=\'1.0\'>\n <office:scripts/>\n diff --git a/bt5/erp5_accounting_l10n_pl/bt/revision b/bt5/erp5_accounting_l10n_pl/bt/revision index cabf43b5dd..410b14d2ce 100644 --- a/bt5/erp5_accounting_l10n_pl/bt/revision +++ b/bt5/erp5_accounting_l10n_pl/bt/revision @@ -1 +1 @@ -24 \ No newline at end of file +25 \ No newline at end of file diff --git a/bt5/erp5_csv_style/SkinTemplateItem/portal_skins/erp5_csv_style/form_list.xml b/bt5/erp5_csv_style/SkinTemplateItem/portal_skins/erp5_csv_style/form_list.xml index 0c5ca81982..da31840c48 100644 --- a/bt5/erp5_csv_style/SkinTemplateItem/portal_skins/erp5_csv_style/form_list.xml +++ b/bt5/erp5_csv_style/SkinTemplateItem/portal_skins/erp5_csv_style/form_list.xml @@ -49,8 +49,8 @@ <value> <string encoding="cdata"><![CDATA[ <tal:block tal:define=\'amp python:"\\""\'\n -><tal:block tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/x-comma-separated-values;; charset=utf-8\');\n - dummy2 python: request.RESPONSE.setHeader(\'Content-disposition\',\'attachment;; filename=%s%s.csv%s\' % (amp,form.title_or_id(),amp) ); "\n +><tal:block tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/x-comma-separated-values; charset=utf-8\');\n + dummy2 python: request.RESPONSE.setHeader(\'Content-disposition\',\'attachment; filename=%s%s.csv%s\' % (amp,form.title_or_id(),amp) ); "\n ><tal:block tal:define="groups python: form.get_groups(include_empty=1);\n field_errors python: request.get(\'field_errors\',{});\n dummy python: request.set(\'here\',here);\n diff --git a/bt5/erp5_csv_style/SkinTemplateItem/portal_skins/erp5_csv_style/form_view.xml b/bt5/erp5_csv_style/SkinTemplateItem/portal_skins/erp5_csv_style/form_view.xml index 374a63e053..5262001f80 100644 --- a/bt5/erp5_csv_style/SkinTemplateItem/portal_skins/erp5_csv_style/form_view.xml +++ b/bt5/erp5_csv_style/SkinTemplateItem/portal_skins/erp5_csv_style/form_view.xml @@ -57,8 +57,8 @@ <tal:block tal:replace="nothing" >\n form_view is a quick hack to display only the listbox called "listbox"\n </tal:block><tal:block tal:define=\'amp python:"\\""\'\n -><tal:block tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/x-comma-separated-values;; charset=utf-8\');\n - dummy2 python: request.RESPONSE.setHeader(\'Content-disposition\',\'attachment;; filename=%s%s.csv%s\' % (amp,form.title_or_id(),amp) ); "\n +><tal:block tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/x-comma-separated-values; charset=utf-8\');\n + dummy2 python: request.RESPONSE.setHeader(\'Content-disposition\',\'attachment; filename=%s%s.csv%s\' % (amp,form.title_or_id(),amp) ); "\n ><tal:block tal:define="groups python: form.get_groups(include_empty=1);\n field_errors python: request.get(\'field_errors\',{});\n dummy python: request.set(\'here\',here);\n diff --git a/bt5/erp5_csv_style/bt/revision b/bt5/erp5_csv_style/bt/revision index e440e5c842..bf0d87ab1b 100644 --- a/bt5/erp5_csv_style/bt/revision +++ b/bt5/erp5_csv_style/bt/revision @@ -1 +1 @@ -3 \ No newline at end of file +4 \ No newline at end of file diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_convert.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_convert.xml index 2ccfc0b2f0..2581b330a4 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_convert.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_convert.xml @@ -89,7 +89,7 @@ filename = \'%s.%s\' % ((filename, format))\n if typ == \'application/zip\':\n filename += \'.zip\'\n \n -request.RESPONSE.setHeader(\'Content-disposition\', \'attachment;; filename="%s"\' % filename)\n +request.RESPONSE.setHeader(\'Content-disposition\', \'attachment; filename="%s"\' % filename)\n return data\n </string> </value> </item> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Image_convert.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Image_convert.xml index c01ed5f7af..dffac0d3de 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Image_convert.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Image_convert.xml @@ -84,7 +84,7 @@ if not fname.endswith(\'.\' + format):\n fname += \'.\' + format\n \n request.RESPONSE.setHeader(\'Content-type\', \'application/\' + format)\n -request.RESPONSE.setHeader(\'Content-disposition\', \'attachment;; filename="%s"\' % fname)\n +request.RESPONSE.setHeader(\'Content-disposition\', \'attachment; filename="%s"\' % fname)\n return context.index_html(request, request.RESPONSE, **kw)\n </string> </value> </item> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_getOOoFile.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_getOOoFile.xml index 2cbace27ef..3187d29de5 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_getOOoFile.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_getOOoFile.xml @@ -74,7 +74,7 @@ to return the file in the base-data format.\n """\n request = context.REQUEST\n response = request.RESPONSE\n -response.setHeader(\'Content-disposition\', \'attachment;; filename="%s"\' % context.getStandardFileName())\n +response.setHeader(\'Content-disposition\', \'attachment; filename="%s"\' % context.getStandardFileName())\n return context.index_html(request, response, format=\'base-data\')\n </string> </value> </item> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_getSnapshot.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_getSnapshot.xml index 6f8a66d687..673c74fe40 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_getSnapshot.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_getSnapshot.xml @@ -75,7 +75,7 @@ file data change).\n """\n request = context.REQUEST\n request.RESPONSE.setHeader(\'Content-type\', context.getSnapshotContentType())\n -request.RESPONSE.setHeader(\'Content-disposition\', \'attachment;; filename="%s.pdf"\' % context.getStandardFileName())\n +request.RESPONSE.setHeader(\'Content-disposition\', \'attachment; filename="%s.pdf"\' % context.getStandardFileName())\n return context.getSnapshotData()\n </string> </value> </item> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_print.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_print.xml index 7164017e02..381fdfaba4 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_print.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_print.xml @@ -75,7 +75,7 @@ so this is what we return.\n \n request = context.REQUEST\n request.RESPONSE.setHeader(\'Content-type\', \'application/x-pdf\')\n -request.RESPONSE.setHeader(\'Content-disposition\', \'attachment;; filename="%s"\' % context.title_or_id())\n +request.RESPONSE.setHeader(\'Content-disposition\', \'attachment; filename="%s"\' % context.title_or_id())\n return context.getTargetFile(\'pdf\')\n </string> </value> </item> diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision index 0e46c90894..b775c5e152 100644 --- a/bt5/erp5_dms/bt/revision +++ b/bt5/erp5_dms/bt/revision @@ -1 +1 @@ -698 \ No newline at end of file +699 \ No newline at end of file diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/diff.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/diff.xml index fffca4cd11..00181f37d8 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/diff.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/diff.xml @@ -96,7 +96,7 @@ else:\n \n diff_dict, missing_in_a_dict, missing_in_b_dict = diff_recursive(object_a, object_b)\n \n -context.REQUEST.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')\n +context.REQUEST.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\')\n print \'<html>\'\n print \'<head><title>Diff between %s and %s</title></head>\' % (object_a.id, object_b.id)\n print \'<body><pre>\'\n diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml index d3d0a547b8..6b2b06639a 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml @@ -75,7 +75,7 @@ from Products.ERP5Subversion.SubversionClient import SubversionSSLTrustError, Su if do_extract == \'True\':\n context.getPortalObject().portal_subversion.extractBT(context)\n \n -context.REQUEST.RESPONSE.setHeader(\'Content-Type\', \'text/xml;; charset=utf-8\')\n +context.REQUEST.RESPONSE.setHeader(\'Content-Type\', \'text/xml; charset=utf-8\')\n \n try:\n root = context.getPortalObject().portal_subversion.getModifiedTree(context, show_unmodified)\n diff --git a/bt5/erp5_forge/bt/description b/bt5/erp5_forge/bt/description index 70c585a1d6..7241b0bda6 100644 --- a/bt5/erp5_forge/bt/description +++ b/bt5/erp5_forge/bt/description @@ -1 +1 @@ -ERP5 Forge helps software development. It provide a bug managment module, integration with SVN and an upload module, glossary module for translation project. \ No newline at end of file +ERP5 Forge helps software development. It provide a bug management module, integration with SVN and an upload module, glossary module for translation project. \ No newline at end of file diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/breadcrumb.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/breadcrumb.xml index ef5c9cfbba..22880564e3 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/breadcrumb.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/breadcrumb.xml @@ -79,7 +79,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n xml:lang="en"\n xmlns:tal="http://xml.zope.org/namespaces/tal"\n xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n - <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n + <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\')">\n <meta name="description" content="Generated by breadcrumb" />\n <title tal:content="template/title" i18n:translate="" i18n:domain="ui">The title</title>\n </head>\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/dialog_master.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/dialog_master.xml index 1857690850..0fe2b93062 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/dialog_master.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/dialog_master.xml @@ -85,7 +85,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n tal:attributes="src python:\'%s/erp5.js\' % here.portal_url()">\n </script>\n \n - <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n + <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\')">\n <meta name="description" content="Generated by dialog_master" />\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_create_relation_dialog.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_create_relation_dialog.xml index a1e74fe256..3de538acc3 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_create_relation_dialog.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_create_relation_dialog.xml @@ -80,7 +80,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n metal:use-macro="here/list_dialog_master/macros/master">\n \n - <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n + <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\')">\n <meta name="description" content="Generated by form_create_relation_dialog" />\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_html.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_html.xml index 829393df4e..1a1fa14e51 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_html.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_html.xml @@ -93,7 +93,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n </script>\n \n <!-- HEAD -->\n - <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n + <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\')">\n <meta name="description" content="Generated by view_master" />\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n <title tal:content="python:\'%s - %s\' % (here.Localizer.erp5_ui.gettext(template.title_or_id()),\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_list.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_list.xml index 991a839c5a..9ae15697b1 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_list.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_list.xml @@ -84,7 +84,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n xmlns:metal="http://xml.zope.org/namespaces/metal"\n xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n metal:use-macro="python:getattr(here,layout_id).macros[\'master\']">\n - <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n + <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\')">\n <meta name="description" content="Generated by form_list" />\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui"></title>\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/global_definition.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/global_definition.xml index 25581c2356..c6d2ba9e24 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/global_definition.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/global_definition.xml @@ -60,7 +60,7 @@ xmlns:metal="http://xml.zope.org/namespaces/metal"\n xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n meta:define-macro="master">\n - <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n + <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\')">\n <meta name="description" content="Generated by global_definition" />\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n <title tal:content="template/title_or_id"\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_dialog_master.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_dialog_master.xml index a53424e5af..06fc2dbde9 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_dialog_master.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_dialog_master.xml @@ -85,7 +85,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n tal:attributes="src python:\'%s/erp5.js\' % here.portal_url()">\n </script>\n \n - <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n + <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\')">\n <meta name="description" content="Generated by list_dialog_master" />\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_master.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_master.xml index 911e90f172..1f3957c79d 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_master.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_master.xml @@ -84,7 +84,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <script language="JavaScript" src="erp5.js">\n </script>\n \n - <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n + <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\')">\n <meta name="description" content="Generated by list_master" />\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_menu_box.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_menu_box.xml index 2ca38d316f..a14d4256ab 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_menu_box.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_menu_box.xml @@ -80,7 +80,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n \n - <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n + <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\')">\n <meta name="description" content="Generated by list_menu_box" />\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/main_template.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/main_template.xml index 189873d25e..eacc99a061 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/main_template.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/main_template.xml @@ -85,7 +85,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n tal:attributes="src python:\'%s/erp5.js\' % here.portal_url()">\n </script>\n \n - <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\',\'text/html;; charset=UTF-8\')">\n + <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\',\'text/html; charset=UTF-8\')">\n <meta name="description" content="Generated by main_template" />\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n <title tal:content="here/portal_properties/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/menu_box.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/menu_box.xml index 9a59232106..6e01a7f59d 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/menu_box.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/menu_box.xml @@ -87,7 +87,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n metal:define-macro="master">\n \n - <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n + <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\')">\n <meta name="description" content="Generated by menu_box" />\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>\n <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/navigation_box.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/navigation_box.xml index e55ace79f4..a1c776313f 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/navigation_box.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/navigation_box.xml @@ -85,7 +85,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n xmlns:metal="http://xml.zope.org/namespaces/metal"\n meta:define-macro="master">\n - <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n + <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\')">\n <meta name="description" content="Generated by navigation_box" />\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/report_list.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/report_list.xml index 2466269a42..b1519fe912 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/report_list.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/report_list.xml @@ -84,7 +84,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n xmlns:metal="http://xml.zope.org/namespaces/metal"\n xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n metal:use-macro="python:getattr(here,layout_id).macros[\'master\']">\n - <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n + <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\')">\n <meta name="description" content="Generated by form_list" />\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui"></title>\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_dialog_master.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_dialog_master.xml index 0f7fd4cde8..b58360d9dc 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_dialog_master.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_dialog_master.xml @@ -85,7 +85,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n tal:attributes="src python:\'%s/erp5.js\' % here.portal_url()">\n </script>\n \n - <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n + <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\')">\n <meta name="description" content="Generated by view_dialog_master" />\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n <!--title tal:content="template/title_or_id">The title</title-->\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_master.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_master.xml index 2b526cfe5d..5a5203b4e4 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_master.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_master.xml @@ -92,7 +92,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <script type="text/javascript" src="wz_dragdrop.js" tal:attributes="src python:\'%s/wz_dragdrop.js\' % here.portal_url()">\n </script>\n \n - <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n + <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\')">\n <meta name="description" content="Generated by view_master" />\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n <title i18n:translate="" i18n:domain="ui">\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_menu_box.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_menu_box.xml index 6e3f8981c2..8220f45085 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_menu_box.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_menu_box.xml @@ -79,7 +79,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n \n - <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n + <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\')">\n <meta name="description" content="Generated by view_menu_box" />\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_selection_box.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_selection_box.xml index 0094c1799a..165a5e03cc 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_selection_box.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_selection_box.xml @@ -85,7 +85,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n xmlns:tal="http://xml.zope.org/namespaces/tal"\n xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n - <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n + <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\')">\n <meta name="description" content="Generated by view_selection_box" />\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui"></title>\n diff --git a/bt5/erp5_html_style/bt/revision b/bt5/erp5_html_style/bt/revision index 8fdd954df9..b393560759 100644 --- a/bt5/erp5_html_style/bt/revision +++ b/bt5/erp5_html_style/bt/revision @@ -1 +1 @@ -22 \ No newline at end of file +23 \ No newline at end of file diff --git a/bt5/erp5_ical_style/SkinTemplateItem/portal_skins/erp5_ical_style/template_ical_style.xml b/bt5/erp5_ical_style/SkinTemplateItem/portal_skins/erp5_ical_style/template_ical_style.xml index 6158aed677..32f0a6f7f5 100644 --- a/bt5/erp5_ical_style/SkinTemplateItem/portal_skins/erp5_ical_style/template_ical_style.xml +++ b/bt5/erp5_ical_style/SkinTemplateItem/portal_skins/erp5_ical_style/template_ical_style.xml @@ -48,7 +48,7 @@ <key> <string>_text</string> </key> <value> <string encoding="cdata"><![CDATA[ -<tal:block tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/calendar;; charset=utf-8\');"\n +<tal:block tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/calendar; charset=utf-8\');"\n ><tal:block tal:define="listbox python:form[\'listbox\'];" \n ><tal:block tal:content="structure python: listbox.render()" />\n </tal:block>\n diff --git a/bt5/erp5_ical_style/bt/revision b/bt5/erp5_ical_style/bt/revision index 62f9457511..c7930257df 100644 --- a/bt5/erp5_ical_style/bt/revision +++ b/bt5/erp5_ical_style/bt/revision @@ -1 +1 @@ -6 \ No newline at end of file +7 \ No newline at end of file diff --git a/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/template_erp5_xhtml_style.xml b/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/template_erp5_xhtml_style.xml index cf3d9cc515..a8ecc02bf0 100644 --- a/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/template_erp5_xhtml_style.xml +++ b/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/template_erp5_xhtml_style.xml @@ -83,7 +83,7 @@ IDEAS:\n <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n \n <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n - <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n + <head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\')">\n <base tal:attributes="href python: \'%s/\' % (url, )"/>\n <meta name="generator" content="ERP5"/>\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>\n diff --git a/bt5/erp5_mobile/bt/revision b/bt5/erp5_mobile/bt/revision index b393560759..cabf43b5dd 100644 --- a/bt5/erp5_mobile/bt/revision +++ b/bt5/erp5_mobile/bt/revision @@ -1 +1 @@ -23 \ No newline at end of file +24 \ No newline at end of file diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml index fc5bc969f1..d858c92e7e 100644 --- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml +++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml @@ -48,7 +48,7 @@ <key> <string>_text</string> </key> <value> <string encoding="cdata"><![CDATA[ -<tal:block xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\' xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\' xmlns:metal=\'http://xml.zope.org/namespaces/metal\' office:version=\'1.0\' metal:define-macro="master" tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'>\n +<tal:block xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\' xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\' xmlns:metal=\'http://xml.zope.org/namespaces/metal\' office:version=\'1.0\' metal:define-macro="master" tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'>\n \n <tal:block metal:use-macro="here/style_macros/macros/style_macro"/>\n <office:scripts/>\n diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_list.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_list.xml index c78eb1c5e5..79e4f9dba0 100644 --- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_list.xml +++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_list.xml @@ -57,7 +57,7 @@ <office:document-content xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n office:version=\'1.0\'\n tal:define="global frame_width python:25.8" metal:define-macro="master">\n <tal:block metal:use-macro="here/style_macros/macros/style_macro"/>\n diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml index ea08835480..e2bd2b19a4 100644 --- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml +++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml @@ -60,7 +60,7 @@ dQEAAAAA</string> </value> <key> <string>_text</string> </key> <value> <string encoding="cdata"><![CDATA[ -<office:document-content xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\' xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\' xmlns:metal=\'http://xml.zope.org/namespaces/metal\' tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\' office:version=\'1.0\' tal:define="global frame_width python:25.8" metal:define-macro="master">\n +<office:document-content xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\' xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\' xmlns:metal=\'http://xml.zope.org/namespaces/metal\' tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\' office:version=\'1.0\' tal:define="global frame_width python:25.8" metal:define-macro="master">\n <tal:block metal:use-macro="here/style_macros/macros/style_macro"/>\n <office:body>\n <office:spreadsheet>\n diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml index f8fb0e566e..1a85269a74 100644 --- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml +++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml @@ -51,7 +51,7 @@ <tal:block xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;;\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;\n charset=utf-8")\'\n office:version=\'1.0\' metal:define-macro="master">\n <tal:block metal:use-macro="here/style_macros/macros/style_macro"/>\n diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/matrixbox_ods_macro.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/matrixbox_ods_macro.xml index 0994199fb9..4d462985f3 100644 --- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/matrixbox_ods_macro.xml +++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/matrixbox_ods_macro.xml @@ -48,7 +48,7 @@ <key> <string>_text</string> </key> <value> <string encoding="cdata"><![CDATA[ -<tal:block xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\' xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\' xmlns:metal=\'http://xml.zope.org/namespaces/metal\' office:version=\'1.0\' metal:define-macro="master" tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'>\n +<tal:block xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\' xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\' xmlns:metal=\'http://xml.zope.org/namespaces/metal\' office:version=\'1.0\' metal:define-macro="master" tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'>\n <tal:block metal:use-macro="here/style_macros/macros/style_macro"/>\n <office:scripts/>\n \n diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml index ab32c6b5a4..64a4baf919 100644 --- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml +++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml @@ -54,7 +54,7 @@ <key> <string>_text</string> </key> <value> <string encoding="cdata"><![CDATA[ -<office:document-content xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\' xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\' xmlns:metal=\'http://xml.zope.org/namespaces/metal\' tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\' office:version=\'1.0\' tal:define="global frame_width python:25.8; global landscape python: int(request.get(\'landscape\', 0) or 0)" metal:define-macro="master">\n +<office:document-content xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\' xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\' xmlns:metal=\'http://xml.zope.org/namespaces/metal\' tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\' office:version=\'1.0\' tal:define="global frame_width python:25.8; global landscape python: int(request.get(\'landscape\', 0) or 0)" metal:define-macro="master">\n <tal:block metal:use-macro="here/style_macros/macros/style_macro"/>\n <office:body>\n <office:spreadsheet>\n diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/style_macros.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/style_macros.xml index f591305201..4e7ac43f73 100644 --- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/style_macros.xml +++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/style_macros.xml @@ -51,7 +51,7 @@ <tal:block xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n office:version=\'1.0\' metal:define-macro="style_macro">\n <office:scripts/>\n <office:font-face-decls>\n diff --git a/bt5/erp5_ods_style/bt/revision b/bt5/erp5_ods_style/bt/revision index 615be700b9..8bfa2f5ecd 100644 --- a/bt5/erp5_ods_style/bt/revision +++ b/bt5/erp5_ods_style/bt/revision @@ -1 +1 @@ -85 \ No newline at end of file +86 \ No newline at end of file diff --git a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_list.xml b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_list.xml index 7619d41ee9..c2234f670f 100644 --- a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_list.xml +++ b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_list.xml @@ -135,7 +135,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n office:version=\'1.0\'>\n <office:scripts/>\n <office:font-face-decls>\n diff --git a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml index ab989a238b..72a8757967 100644 --- a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml +++ b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml @@ -135,7 +135,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n tal:define="global frame_width python:25.8"\n office:version=\'1.0\'>\n <office:scripts/>\n diff --git a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml index 8a0124bbf8..5d60cf30f9 100644 --- a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml +++ b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml @@ -72,7 +72,7 @@ xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n office:version=\'1.0\'>\n <office:scripts/>\n <office:font-face-decls>\n diff --git a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/matrixbox_odt_macro.xml b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/matrixbox_odt_macro.xml index 7c521d6d6a..3c0908ff12 100644 --- a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/matrixbox_odt_macro.xml +++ b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/matrixbox_odt_macro.xml @@ -76,7 +76,7 @@ xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n tal:attributes=\'dummy\n - python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n tal:define="global frame_width python:25.8"\n office:version=\'1.0\'>\n <office:scripts/>\n diff --git a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml index cb6b9f7a2e..8cbaae2fd7 100644 --- a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml +++ b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml @@ -135,7 +135,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n office:version=\'1.0\'>\n <office:scripts/>\n <office:font-face-decls>\n diff --git a/bt5/erp5_odt_style/bt/revision b/bt5/erp5_odt_style/bt/revision index 3cacc0b93c..ca7bf83ac5 100644 --- a/bt5/erp5_odt_style/bt/revision +++ b/bt5/erp5_odt_style/bt/revision @@ -1 +1 @@ -12 \ No newline at end of file +13 \ No newline at end of file diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportAsOdt.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportAsOdt.xml index 5c257501f5..112f3ce9b9 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportAsOdt.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportAsOdt.xml @@ -63,7 +63,7 @@ AAA=</string> </value> <office:document-content xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n office:version=\'1.0\'>\n <office:scripts/>\n <office:font-face-decls>\n diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportMacro.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportMacro.xml index 70231c6918..4291165ec5 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportMacro.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportMacro.xml @@ -52,7 +52,7 @@ <office:document-content xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n office:version=\'1.0\'>\n <office:scripts/>\n <office:font-face-decls>\n diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewDetailedReportAsOdt.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewDetailedReportAsOdt.xml index 3c0ba8b2d7..df4c27df64 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewDetailedReportAsOdt.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewDetailedReportAsOdt.xml @@ -64,7 +64,7 @@ AAA=</string> </value> <office:document-content xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n office:version=\'1.0\'>\n <office:scripts/>\n <office:font-face-decls>\n diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrderMappingReportAsOdt.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrderMappingReportAsOdt.xml index a25cba8844..24508209de 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrderMappingReportAsOdt.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrderMappingReportAsOdt.xml @@ -70,7 +70,7 @@ AAA=</string> </value> <office:document-content xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n office:version=\'1.0\'>\n <office:scripts/>\n <office:font-face-decls>\n diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewProjectMappingReportAsOdt.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewProjectMappingReportAsOdt.xml index e78911c8ca..c2f627b196 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewProjectMappingReportAsOdt.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewProjectMappingReportAsOdt.xml @@ -64,7 +64,7 @@ AAA=</string> </value> <office:document-content xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n office:version=\'1.0\'>\n <office:scripts/>\n <office:font-face-decls>\n diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_odt_view.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_odt_view.xml index 82bd2b5498..b0eb5439a7 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_odt_view.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_odt_view.xml @@ -62,7 +62,7 @@ AAAAAAAAAAAATUVUQS1JTkYvbWFuaWZlc3QueG1sUEsFBgAAAAABAAEAQwAAADEBAAAAAA==</string <office:document-content xmlns:draw=\'http://openoffice.org/2000/drawing\' xmlns:office=\'http://openoffice.org/2000/office\' xmlns:text=\'http://openoffice.org/2000/text\' xmlns:number=\'http://openoffice.org/2000/datastyle\' xmlns:chart=\'http://openoffice.org/2000/chart\' xmlns:table=\'http://openoffice.org/2000/table\' xmlns:dr3d=\'http://openoffice.org/2000/dr3d\' xmlns:fo=\'http://www.w3.org/1999/XSL/Format\' xmlns:style=\'http://openoffice.org/2000/style\' xmlns:form=\'http://openoffice.org/2000/form\' xmlns:script=\'http://openoffice.org/2000/script\' xmlns:svg=\'http://www.w3.org/2000/svg\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' office:class=\'text\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n office:version=\'1.0\'>\n <office:script/>\n <office:font-decls>\n diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.xml index 28cf979a19..47e00e9826 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.xml @@ -136,7 +136,7 @@ for obj in obj_list : \n print "END:VCALENDAR"\n \n context.REQUEST.RESPONSE.setHeader(\'Content-Type\', \'text/calendar\')\n -context.REQUEST.RESPONSE.setHeader(\'Content-disposition\', \'attachment;; filename=ERP5.ics\')\n +context.REQUEST.RESPONSE.setHeader(\'Content-disposition\', \'attachment; filename=ERP5.ics\')\n return printed\n diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewDetailedReportAsOdt.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewDetailedReportAsOdt.xml index c19cf25ba4..65ac75517c 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewDetailedReportAsOdt.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewDetailedReportAsOdt.xml @@ -63,7 +63,7 @@ AAA=</string> </value> <office:document-content xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n office:version=\'1.0\'>\n <office:scripts/>\n <office:font-face-decls>\n diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportAsOdt.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportAsOdt.xml index fbfde734d5..6938fed8bc 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportAsOdt.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportAsOdt.xml @@ -69,7 +69,7 @@ AAA=</string> </value> <office:document-content xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n office:version=\'1.0\'>\n <office:scripts/>\n <office:font-face-decls>\n diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportMacro.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportMacro.xml index 3f6049fa82..1d0d520d4c 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportMacro.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportMacro.xml @@ -58,7 +58,7 @@ <office:document-content xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n - tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n + tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")\'\n office:version=\'1.0\'>\n <office:scripts/>\n <office:font-face-decls>\n diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision index 4b74f2216d..832f62a3cb 100644 --- a/bt5/erp5_project/bt/revision +++ b/bt5/erp5_project/bt/revision @@ -1 +1 @@ -338 \ No newline at end of file +339 \ No newline at end of file diff --git a/bt5/erp5_rss_style/SkinTemplateItem/portal_skins/erp5_rss_style/template_rss_style.xml b/bt5/erp5_rss_style/SkinTemplateItem/portal_skins/erp5_rss_style/template_rss_style.xml index e5eb5a5684..4abcdcc188 100644 --- a/bt5/erp5_rss_style/SkinTemplateItem/portal_skins/erp5_rss_style/template_rss_style.xml +++ b/bt5/erp5_rss_style/SkinTemplateItem/portal_skins/erp5_rss_style/template_rss_style.xml @@ -48,7 +48,7 @@ <key> <string>_text</string> </key> <value> <string encoding="cdata"><![CDATA[ -<tal:block tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'application/rss+xml;; charset=utf-8\');"\n +<tal:block tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'application/rss+xml; charset=utf-8\');"\n ><tal:block tal:define="listbox python:form[\'listbox\'];" \n ><tal:block tal:content="structure python: listbox.render()" />\n </tal:block>\n diff --git a/bt5/erp5_rss_style/bt/revision b/bt5/erp5_rss_style/bt/revision index 9d607966b7..3cacc0b93c 100644 --- a/bt5/erp5_rss_style/bt/revision +++ b/bt5/erp5_rss_style/bt/revision @@ -1 +1 @@ -11 \ No newline at end of file +12 \ No newline at end of file diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web.css.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web.css.xml index e74a83b303..5d123f0ab4 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web.css.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web.css.xml @@ -59,7 +59,7 @@ xmlns:metal="http://xml.zope.org/namespaces/metal"\n xmlns:i18n="http://xml.zope.org/namespaces/i18n"/>\n \n -<tal:block define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \'text/css;; charset=utf-8\')"/>\n +<tal:block define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \'text/css; charset=utf-8\')"/>\n \n /*========================================================================================\n Default ERP5 Web CSS.\n diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_admin_toolbox.css.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_admin_toolbox.css.xml index df973fc369..12788319b7 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_admin_toolbox.css.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_admin_toolbox.css.xml @@ -63,7 +63,7 @@ xmlns:metal="http://xml.zope.org/namespaces/metal"\n xmlns:i18n="http://xml.zope.org/namespaces/i18n"/>\n \n -<tal:block define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \'text/css;; charset=utf-8\')"/>\n +<tal:block define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \'text/css; charset=utf-8\')"/>\n \n \n div.adminToolbox input, textarea{ /* This should be common XXX */\n diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_content.css.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_content.css.xml index 9360a2ed57..4d750d3b45 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_content.css.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_content.css.xml @@ -63,7 +63,7 @@ xmlns:metal="http://xml.zope.org/namespaces/metal"\n xmlns:i18n="http://xml.zope.org/namespaces/i18n"/>\n \n -<tal:block define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \'text/css;; charset=utf-8\')"/>\n +<tal:block define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \'text/css; charset=utf-8\')"/>\n \n \n /*========================================================================================\n diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_editable_content.css.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_editable_content.css.xml index 3ae7264e98..09e741b16e 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_editable_content.css.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_editable_content.css.xml @@ -63,7 +63,7 @@ xmlns:metal="http://xml.zope.org/namespaces/metal"\n xmlns:i18n="http://xml.zope.org/namespaces/i18n"/>\n \n -<tal:block define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \'text/css;; charset=utf-8\')"/>\n +<tal:block define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \'text/css; charset=utf-8\')"/>\n \n /*========================================================================================\n ** FORMs & INPUTs\n diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/template_erp5_web.css.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/template_erp5_web.css.xml index e6b0bffd8b..a1ea89f52a 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/template_erp5_web.css.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/template_erp5_web.css.xml @@ -57,7 +57,7 @@ xmlns:metal="http://xml.zope.org/namespaces/metal"\n xmlns:i18n="http://xml.zope.org/namespaces/i18n"/>\n \n -<tal:block define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \'text/css;; charset=utf-8\')"/>\n +<tal:block define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \'text/css; charset=utf-8\')"/>\n \n \n html {\n diff --git a/bt5/erp5_web/bt/description b/bt5/erp5_web/bt/description index bcd829eac4..0297e1d7fb 100644 --- a/bt5/erp5_web/bt/description +++ b/bt5/erp5_web/bt/description @@ -1,4 +1,4 @@ -Simple yet powerful publication system over the web. Can serve any ERP5 object whithin a custom web design / layout. +Simple yet powerful publication system over the web. Can serve any ERP5 object within a custom web design / layout. Features: * Friendly URLs. diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision index d21b6ea29b..25802a2003 100644 --- a/bt5/erp5_web/bt/revision +++ b/bt5/erp5_web/bt/revision @@ -1 +1 @@ -591 \ No newline at end of file +592 \ No newline at end of file diff --git a/product/ERP5/Document/EmailDocument.py b/product/ERP5/Document/EmailDocument.py index b929d21e03..5331de78d9 100644 --- a/product/ERP5/Document/EmailDocument.py +++ b/product/ERP5/Document/EmailDocument.py @@ -202,7 +202,7 @@ class EmailDocument(File, TextDocument): file_name = re.findall(file_name_regexp, content_disposition, re.MULTILINE) if file_name: file_name = file_name[0] - RESPONSE.setHeader('Content-disposition', 'attachment;; filename="%s"' % file_name) + RESPONSE.setHeader('Content-disposition', 'attachment; filename="%s"' % file_name) return part.get_payload(decode=1) i += 1 return KeyError, "No attachment with index %s" % index diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_download.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_download.xml index 5b777fe636..15ca67aa59 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_download.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_download.xml @@ -77,7 +77,7 @@ else:\n response.setHeader(\'Content-type\', context.getFormat())\n \n file_name = context.getSourceReference() or context.getTitle() or context.getId()\n -response.setHeader(\'Content-disposition\', \'attachment;; filename="%s"\' % file_name)\n +response.setHeader(\'Content-disposition\', \'attachment; filename="%s"\' % file_name)\n return context.index_html(request, response)\n </string> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index 8fc2b18859..e1170b6414 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -488 \ No newline at end of file +489 \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml index f7b8d73e14..3c46e5b364 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml @@ -66,7 +66,7 @@ cancel_url request/cancel_url | current_url;\n dummy python: local_parameter_list.update({\'cancel_url\': cancel_url});\n \n - dummy python: request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\');\n + dummy python: request.RESPONSE.setHeader(\'Content-Type\', \'text/html; charset=utf-8\');\n dummy python: request.set(\'here\', here);\n \n global css_list css_list | python: [];\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 97964b3fde..26f5507e83 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -422 \ No newline at end of file +423 \ No newline at end of file diff --git a/product/ERP5/tests/testBase.py b/product/ERP5/tests/testBase.py index cb69be1fc7..cf9a208166 100644 --- a/product/ERP5/tests/testBase.py +++ b/product/ERP5/tests/testBase.py @@ -980,7 +980,7 @@ class TestBase(ERP5TypeTestCase, ZopeTestCase.Functional): response = self.publish('%s/Base_download' % f.getPath()) self.assertEquals(file(__file__).read(), response.body) self.assertEquals('text/plain', response.headers['content-type']) - self.assertEquals('attachment;; filename="%s"' % os.path.basename(__file__), + self.assertEquals('attachment; filename="%s"' % os.path.basename(__file__), response.headers['content-disposition']) class TestERP5PropertyManager(unittest.TestCase): diff --git a/product/ERP5OOo/OOoTemplate.py b/product/ERP5OOo/OOoTemplate.py index 44e98e604e..d1835664eb 100644 --- a/product/ERP5OOo/OOoTemplate.py +++ b/product/ERP5OOo/OOoTemplate.py @@ -484,10 +484,10 @@ xmlns:config="http://openoffice.org/2001/config" office:version="1.0"> return self._asFormat(ooo, format, request, batch_mode) if not format and not batch_mode: - request.RESPONSE.setHeader('Content-Type','%s;; charset=utf-8' % self.content_type) + request.RESPONSE.setHeader('Content-Type','%s; charset=utf-8' % self.content_type) request.RESPONSE.setHeader('Content-disposition', 'inline;filename=%s' % self.title_or_id()) else: - request.RESPONSE.setHeader('Content-Type','%s;; charset=utf-8' % 'text/html') + request.RESPONSE.setHeader('Content-Type','%s; charset=utf-8' % 'text/html') request.RESPONSE.setHeader('Content-disposition', 'inline;filename=%s' % self.title_or_id()) return ooo diff --git a/product/ERP5OOo/OOoUtils.py b/product/ERP5OOo/OOoUtils.py index 172adda56a..7307cd318d 100644 --- a/product/ERP5OOo/OOoUtils.py +++ b/product/ERP5OOo/OOoUtils.py @@ -153,7 +153,7 @@ class OOoBuilder(Implicit): """ xmlns:tal='http://xml.zope.org/namespaces/tal' xmlns:i18n='http://xml.zope.org/namespaces/i18n' xmlns:metal='http://xml.zope.org/namespaces/metal' - tal:attributes='dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")' + tal:attributes='dummy python:request.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")' office:version='1.0'""") def addFileEntry(self, full_path, media_type, content=None): diff --git a/product/ERP5OOo/tests/testDms.py b/product/ERP5OOo/tests/testDms.py index 642ee1de3e..0419304027 100644 --- a/product/ERP5OOo/tests/testDms.py +++ b/product/ERP5OOo/tests/testDms.py @@ -477,7 +477,7 @@ class TestDocument(ERP5TypeTestCase, ZopeTestCase.Functional): response.body) self.assertEquals('application/vnd.oasis.opendocument.spreadsheet', response.headers['content-type']) - self.assertEquals('attachment;; filename="import_data_list.ods"', + self.assertEquals('attachment; filename="import_data_list.ods"', response.headers['content-disposition']) def test_Member_download_pdf_format(self): @@ -498,7 +498,7 @@ class TestDocument(ERP5TypeTestCase, ZopeTestCase.Functional): response = self.publish('%s/Document_convert?format=pdf' % doc.getPath(), basic='member_user2:secret') self.assertEquals('application/pdf', response.headers['content-type']) - self.assertEquals('attachment;; filename="import_data_list.pdf"', + self.assertEquals('attachment; filename="import_data_list.pdf"', response.headers['content-disposition']) -- 2.30.9