diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/translate.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/translate.xml deleted file mode 100755 index 5989b16bd25f04e1bd92d7c0239c1f9cfd99ed8f..0000000000000000000000000000000000000000 --- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/translate.xml +++ /dev/null @@ -1,93 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.ActionInformation</string> - <string>ActionInformation</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>action</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>category</string> </key> - <value> <string>object_exchange</string> </value> - </item> - <item> - <key> <string>condition</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>icon</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>translate</string> </value> - </item> - <item> - <key> <string>optional</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>permissions</string> </key> - <value> - <tuple> - <string>Translate Content</string> - </tuple> - </value> - </item> - <item> - <key> <string>priority</string> </key> - <value> <float>15.0</float> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Translate</string> </value> - </item> - <item> - <key> <string>visible</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.Expression</string> - <string>Expression</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>text</string> </key> - <value> <string>string:${object_url}/translation_template_view</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_createModule.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_createModule.xml index 6bd41837bed5f2aa55233f24b5d02efdafe147fe..3e0b10fa905863138ec61b2741fcf70fa1b79ac6 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_createModule.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_createModule.xml @@ -122,7 +122,13 @@ module_portal_type_value.addAction( "list_ui"\n , "View"\n , "object_ui"\n )\n -\n +module_portal_type_value.addAction( "print_pdf"\n + , "Print"\n + , "string:${object_url}/Base_printPdf"\n + , ""\n + , "View"\n + , "object_print"\n + )\n # Create the skin directory if does not exist yet\n portal_skins_folder_name = portal_skins_folder\n portal_skins = portal.portal_skins\n @@ -169,6 +175,13 @@ object_portal_type_value.addAction( "view"\n , "View"\n , "object_view"\n )\n +object_portal_type_value.addAction( "history"\n + , "History"\n + , "string:${object_url}/Base_viewHistory"\n + , ""\n + , "View"\n + , "object_view"\n + )\n object_portal_type_value.addAction( "metadata"\n , "Metadata"\n , "string:${object_url}/Base_viewMetadata"\n @@ -176,8 +189,13 @@ object_portal_type_value.addAction( "metadata"\n , "Manage properties"\n , "object_view"\n )\n -\n -\n +object_portal_type_value.addAction( "print_pdf"\n + , "Print"\n + , "string:${object_url}/Base_printPdf"\n + , ""\n + , "View"\n + , "object_print"\n + )\n # Finally add the module to the site\n portal.newContent( portal_type = module_portal_type\n , id = module_id\n diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Organisation_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Organisation_view.xml index 58dc4d709583ec8f24e55dabdbf4a5ccfd1f5704..764b41bdee3d2be6586093965a88d2eb301f30b6 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Organisation_view.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Organisation_view.xml @@ -99,7 +99,7 @@ <string>my_activity</string> <string>my_function</string> <string>my_site</string> - <string>my_validation_state</string> + <string>my_translated_validation_state_title</string> </list> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Organisation_view/my_validation_state.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Organisation_view/my_translated_validation_state_title.xml similarity index 97% rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Organisation_view/my_validation_state.xml rename to product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Organisation_view/my_translated_validation_state_title.xml index 07ca19cae6ccbd3454235f91b7e56cd36f59efc5..2d7d2549ecf8a2917099b029811661517427600d 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Organisation_view/my_validation_state.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Organisation_view/my_translated_validation_state_title.xml @@ -12,9 +12,15 @@ </pickle> <pickle> <dictionary> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>id</string> </key> - <value> <string>my_validation_state</string> </value> + <value> <string>my_translated_validation_state_title</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -243,7 +249,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Validation State</string> </value> + <value> <string>State</string> </value> </item> <item> <key> <string>truncate</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_html_style/field_render.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_html_style/field_render.xml index 9a28d9353100c9ed9d04afe153c9487a3440face..2e62a2a8ce5311f67a11ce87da612da357eb1601 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_html_style/field_render.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_html_style/field_render.xml @@ -55,24 +55,32 @@ <value> <string encoding="cdata"><![CDATA[ <tal:block metal:define-macro="field_render">\n - <tr tal:condition="python:field.meta_type != \'HiddenStringField\'">\n - <td tal:content="structure field/title"\n - tal:attributes="class python: \n - {0: {0: None, 1: \'required\'},\n - 1: {0: \'error\', 1: \'reqerror\'}}[field_errors.has_key(field.id)][field.is_required()]"\n - i18n:translate="" i18n:domain="ui" />\n - <td tal:define="value python:request.get(field.id, None)">\n - <tal:block tal:replace="structure python: field.render(value, request)" />\n - </td>\n - </tr>\n - <tr tal:condition="python: field_errors.has_key(field.id)">\n - <td />\n - <td tal:content="python:field_errors[field.id].error_text"\n - i18n:translate="" i18n:domain="ui"\n - class="error" />\n - </tr>\n -</tal:block>\n - + <tal:block tal:define="value python:request.get(field.id, None)">\n + <tal:block tal:define="html_render python: field.render_htmlgrid(value, request)">\n + <tal:block tal:condition="python:field.meta_type != \'HiddenStringField\'">\n + <tal:repeat repeat="html_tuple html_render">\n + <tr>\n + <td tal:content="structure python: html_tuple[0]"\n + tal:attributes="class python: \n + {0: {0: None, 1: \'required\'},\n + 1: {0: \'error\', 1: \'reqerror\'}}[field_errors.has_key(field.id)][field.is_required()]"\n + i18n:translate="" i18n:domain="ui" />\n + <td>\n + <tal:block tal:replace="structure python: html_tuple[1]" />\n + </td>\n + </tr>\n + \n + </tal:repeat>\n + </tal:block>\n + <tr tal:condition="python: field_errors.has_key(field.id)">\n + <td />\n + <td tal:content="python:field_errors[field.id].error_text"\n + i18n:translate="" i18n:domain="ui"\n + class="error" />\n + </tr>\n + </tal:block>\n + </tal:block>\n +</tal:block> ]]></string> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log index 00c4dc70fdff0dbcc673ae4e180a37ae6d49122c..badafb726c36bcbe5a57130f2854564e35b5ab34 100755 --- a/product/ERP5/bootstrap/erp5_core/bt/change_log +++ b/product/ERP5/bootstrap/erp5_core/bt/change_log @@ -556,4 +556,4 @@ variation * Add base categorie from erp5_apparel_depend: origin. 2005-04-06 -* Add base categories from erp5_trade, erp5_accounting: destination_administration, destination_decision, destination_payment, source_administration, source_decision, source_payment. +* Add base categories from erp5_trade, erp5_accounting: destination_administration, destination_decision, destination_payment, source_administration, source_decision, source_payment. \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_action_path_list b/product/ERP5/bootstrap/erp5_core/bt/template_action_path_list index fa0e7a7e63ef8e28de623caba69ac756775062b2..47b99546330d75940213d753e089105db86aaddd 100755 --- a/product/ERP5/bootstrap/erp5_core/bt/template_action_path_list +++ b/product/ERP5/bootstrap/erp5_core/bt/template_action_path_list @@ -213,7 +213,6 @@ Person | print Person | profile Person | report Person | terminate_career -Person | translate Person | view Predicate | print_pdf Predicate | view