diff --git a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_list.xml b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_list.xml index 04fd2fd373e5c66af955adfbe7cf5f0cfaaf18c5..1e7e8984c3375b68bbf647b7ae7a09220d63f912 100644 --- a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_list.xml +++ b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_list.xml @@ -59,13 +59,10 @@ <subject>Print Example</subject>\n <content>\n <tal:block metal:define-macro="form_layout"\n - 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 - listbox python:form.get_fields_in_group(groups[0])[0];">\n + tal:define="dummy python: request.set(\'here\',here);\n + listbox form/listbox | nothing;">\n \n -\n - <tal:block tal:condition="python: listbox.meta_type == \'ListBox\'">\n + <tal:block tal:condition="listbox">\n <div metal:use-macro="here/listbox_pdf_macro/macros/listbox" />\n </tal:block>\n \n diff --git a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_view.xml b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_view.xml index e73c4bf9acb6adf5a2998f29b61496de481cb91b..3f5d0e9cfb3a981c06869844ff3cc3194bb4e07a 100644 --- a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_view.xml +++ b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_view.xml @@ -65,15 +65,12 @@ <subject>Print Example</subject>\n <content>\n <tal:block metal:define-macro="form_layout"\n - tal:define="group_list python: form.get_groups(include_empty=1);\n - field_errors python: request.get(\'field_errors\',{});\n - dummy python: request.set(\'here\',here); ">\n + tal:define="dummy python: request.set(\'here\',here); ">\n \n \n - <tal:block tal:repeat="group python: group_list[:3]">\n + <tal:block tal:repeat="group python: [\'Default\', \'left\', \'right\', \'center\']">\n <tal:block tal:define="field_list python: form.get_fields_in_group(group)">\n - <tal:block tal:condition="python: field_list not in [None, []]">\n -\n + <tal:block tal:condition="field_list">\n <table splitbyrow="1" repeatrows="0" repeatcols="0" style="AttributesTable" >\n <tal:block tal:repeat="field field_list">\n <tal:block tal:condition="python:field.meta_type != \'HiddenStringField\'">\n @@ -115,36 +112,25 @@ \n </tal:block>\n </tal:block>\n -\n -\n </tal:block>\n \n - <tal:block tal:condition="python: len(group_list) > 3">\n - <tal:block tal:define="field_list python: form.get_fields_in_group(group_list[3])">\n - <tal:block tal:condition="python: field_list not in [None, []]">\n - <tal:block tal:repeat="field field_list">\n + <tal:block tal:define="field_list python: form.get_fields_in_group(\'bottom\')">\n + <tal:block tal:repeat="field field_list">\n \n - <tal:block tal:condition="python: field.meta_type == \'MatrixBox\'">\n - <tal:block tal:define="matrixbox python:field;">\n - <div metal:use-macro="here/matrixbox_pdf_macro/macros/matrixbox" />\n - </tal:block>\n + <tal:block tal:condition="python: field.meta_type == \'MatrixBox\'">\n + <tal:block tal:define="matrixbox python:field;">\n + <div metal:use-macro="here/matrixbox_pdf_macro/macros/matrixbox" />\n </tal:block>\n + </tal:block>\n \n -\n -\n - <tal:block tal:condition="python: field.meta_type == \'ListBox\'">\n -\n - <tal:block tal:define="listbox python:field;" >\n - <div metal:use-macro="here/listbox_pdf_macro/macros/listbox" />\n - </tal:block>\n -\n - <table><tr><td tal:content="python: \' \'"></td></tr></table>\n -\n + <tal:block tal:condition="python: field.meta_type == \'ListBox\'">\n + <tal:block tal:define="listbox python:field;" >\n + <div metal:use-macro="here/listbox_pdf_macro/macros/listbox" />\n </tal:block>\n + <table><tr><td tal:content="python: \' \'"></td></tr></table>\n </tal:block>\n </tal:block>\n </tal:block>\n - </tal:block>\n \n \n </tal:block>\n diff --git a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml index fdcde7d400981c39419272e20e7b27f5224f8a2a..a7fb8f1163f08ef338d8f1a6f4d03b9804c15bfa 100644 --- a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml +++ b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml @@ -77,9 +77,9 @@ \n <spacer height="100" tal:condition="form/get_fields"/>\n \n - <tal:block tal:repeat="group python: group_list[:3]">\n + <tal:block tal:repeat="group python: [\'Default\', \'left\', \'right\', \'center\']">\n <tal:block tal:define="field_list python: form.get_fields_in_group(group)">\n - <tal:block tal:condition="python: field_list not in [None, []]">\n + <tal:block tal:condition="field_list">\n \n <table splitbyrow="1" repeatrows="0" repeatcols="0" style="AttributesTable" >\n <tal:block tal:repeat="field field_list">\n @@ -110,36 +110,28 @@ \n </tal:block>\n </tal:block>\n -\n -\n </tal:block>\n \n - <tal:block tal:condition="python: len(group_list) > 3">\n - <tal:block tal:define="field_list python: form.get_fields_in_group(group_list[3])">\n - <tal:block tal:condition="python: field_list not in [None, []]">\n + <tal:block tal:define="field_list python: form.get_fields_in_group(\'bottom\')">\n + <tal:block tal:condition="field_list">\n <tal:block tal:repeat="field field_list">\n -\n + \n <tal:block tal:condition="python: field.meta_type == \'MatrixBox\'">\n <tal:block tal:define="matrixbox python:field;">\n <div metal:use-macro="here/matrixbox_pdf_macro/macros/matrixbox" />\n </tal:block>\n </tal:block>\n -\n -\n \n <tal:block tal:condition="python: field.meta_type == \'ListBox\'">\n -\n <tal:block tal:define="listbox python:field;" >\n <div metal:use-macro="here/listbox_pdf_macro/macros/listbox" />\n </tal:block>\n -\n <table><tr><td tal:content="python: \' \'"></td></tr></table>\n \n </tal:block>\n </tal:block>\n </tal:block>\n </tal:block>\n - </tal:block>\n \n \n <spacer height="100"/>\n diff --git a/bt5/erp5_pdf_style/bt/revision b/bt5/erp5_pdf_style/bt/revision index dce6588ca1420a69eea5699f2ec5d666daf16a6a..c24b6ae77df02a87472b208f251fad88382a2e55 100644 --- a/bt5/erp5_pdf_style/bt/revision +++ b/bt5/erp5_pdf_style/bt/revision @@ -1 +1 @@ -36 \ No newline at end of file +38 \ No newline at end of file