From 70707c2013249e5fc8b66aba66a371bc15404c0b Mon Sep 17 00:00:00 2001 From: Yusei Tahara <yusei@nexedi.com> Date: Mon, 1 Feb 2010 04:42:03 +0000 Subject: [PATCH] 2010-2-1 yusei * Fix a mistake. Labor document must list up career documents. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32106 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...rson_getCareerListAsLaborListPrintOut.xml} | 4 +- ...rson_viewJapaneseLaborDocumentPrintOut.xml | 1 - .../listbox.xml | 12 +- .../my_aaaa.xml | 281 ------------------ bt5/erp5_hr_l10n_jp/bt/change_log | 3 + bt5/erp5_hr_l10n_jp/bt/revision | 2 +- 6 files changed, 12 insertions(+), 291 deletions(-) rename bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/{Person_getAssignmentListAsLaborListPrintOut.xml => Person_getCareerListAsLaborListPrintOut.xml} (97%) delete mode 100644 bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/Person_viewJapaneseLaborDocumentPrintOut/my_aaaa.xml diff --git a/bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/Person_getAssignmentListAsLaborListPrintOut.xml b/bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/Person_getCareerListAsLaborListPrintOut.xml similarity index 97% rename from bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/Person_getAssignmentListAsLaborListPrintOut.xml rename to bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/Person_getCareerListAsLaborListPrintOut.xml index edf735d3da..4cf679bfcd 100644 --- a/bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/Person_getAssignmentListAsLaborListPrintOut.xml +++ b/bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/Person_getCareerListAsLaborListPrintOut.xml @@ -54,7 +54,7 @@ <item> <key> <string>_body</string> </key> <value> <string>temporary_result = [assignment\n - for assignment in context.contentValues(portal_type=\'Assignment\')\n + for assignment in context.contentValues(portal_type=\'Career\')\n if assignment.getValidationState()==\'open\']\n return sequence.sort(temporary_result, ((\'start_date\', \'cmp\', \'asc\'),))\n </string> </value> @@ -119,7 +119,7 @@ return sequence.sort(temporary_result, ((\'start_date\', \'cmp\', \'asc\'),))\n </item> <item> <key> <string>id</string> </key> - <value> <string>Person_getAssignmentListAsLaborListPrintOut</string> </value> + <value> <string>Person_getCareerListAsLaborListPrintOut</string> </value> </item> <item> <key> <string>warnings</string> </key> diff --git a/bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/Person_viewJapaneseLaborDocumentPrintOut.xml b/bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/Person_viewJapaneseLaborDocumentPrintOut.xml index 98f68f00a3..63b462010b 100644 --- a/bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/Person_viewJapaneseLaborDocumentPrintOut.xml +++ b/bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/Person_viewJapaneseLaborDocumentPrintOut.xml @@ -102,7 +102,6 @@ <string>my_career_function_title</string> <string>my_address_text</string> <string>listbox</string> - <string>my_aaaa</string> </list> </value> </item> diff --git a/bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/Person_viewJapaneseLaborDocumentPrintOut/listbox.xml b/bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/Person_viewJapaneseLaborDocumentPrintOut/listbox.xml index 7dea43bb69..803d1c213a 100644 --- a/bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/Person_viewJapaneseLaborDocumentPrintOut/listbox.xml +++ b/bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/Person_viewJapaneseLaborDocumentPrintOut/listbox.xml @@ -360,14 +360,14 @@ <string>title</string> <string>title</string> </tuple> - <tuple> - <string>start_date</string> - <string>start_date</string> - </tuple> <tuple> <string>description</string> <string>description</string> </tuple> + <tuple> + <string>start_date</string> + <string>start_date</string> + </tuple> </list> </value> </item> @@ -517,7 +517,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Assignments</string> </value> + <value> <string>Career list</string> </value> </item> <item> <key> <string>untranslatable_columns</string> </key> @@ -548,7 +548,7 @@ <dictionary> <item> <key> <string>method_name</string> </key> - <value> <string>Person_getAssignmentListAsLaborListPrintOut</string> </value> + <value> <string>Person_getCareerListAsLaborListPrintOut</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/Person_viewJapaneseLaborDocumentPrintOut/my_aaaa.xml b/bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/Person_viewJapaneseLaborDocumentPrintOut/my_aaaa.xml deleted file mode 100644 index 11996fb217..0000000000 --- a/bt5/erp5_hr_l10n_jp/SkinTemplateItem/portal_skins/erp5_hr_l10n_jp/Person_viewJapaneseLaborDocumentPrintOut/my_aaaa.xml +++ /dev/null @@ -1,281 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="StringField" module="Products.Formulator.StandardFields"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>id</string> </key> - <value> <string>my_aaaa</string> </value> - </item> - <item> - <key> <string>message_values</string> </key> - <value> - <dictionary> - <item> - <key> <string>external_validator_failed</string> </key> - <value> <string>The input failed the external validator.</string> </value> - </item> - <item> - <key> <string>required_not_found</string> </key> - <value> <string>Input is required but no input given.</string> </value> - </item> - <item> - <key> <string>too_long</string> </key> - <value> <string>Too much input was given.</string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>overrides</string> </key> - <value> - <dictionary> - <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>css_class</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>display_maxwidth</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>display_width</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>external_validator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>extra</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>truncate</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>unicode</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>tales</string> </key> - <value> - <dictionary> - <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>css_class</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>display_maxwidth</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>display_width</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>external_validator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>extra</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>truncate</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>unicode</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>values</string> </key> - <value> - <dictionary> - <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>css_class</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>display_maxwidth</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>display_width</string> </key> - <value> <int>20</int> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>external_validator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>extra</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>my_aaaa</string> </value> - </item> - <item> - <key> <string>truncate</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>unicode</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python:here.getDefaultEmailText()</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_hr_l10n_jp/bt/change_log b/bt5/erp5_hr_l10n_jp/bt/change_log index 3b446214fd..1109c6349a 100644 --- a/bt5/erp5_hr_l10n_jp/bt/change_log +++ b/bt5/erp5_hr_l10n_jp/bt/change_log @@ -1,3 +1,6 @@ +2010-2-1 yusei +* Fix a mistake. Labor document must list up career documents. + 2010-1-31 yusei * Add Japanese labor document printout. * Remove two categories, career_start_mode and career_stop_mode. diff --git a/bt5/erp5_hr_l10n_jp/bt/revision b/bt5/erp5_hr_l10n_jp/bt/revision index bf0d87ab1b..7813681f5b 100644 --- a/bt5/erp5_hr_l10n_jp/bt/revision +++ b/bt5/erp5_hr_l10n_jp/bt/revision @@ -1 +1 @@ -4 \ No newline at end of file +5 \ No newline at end of file -- 2.30.9