diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getAttachedApplicationIncomeList.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getAttachedApplicationIncomeList.xml index 4663548a1b526387e1e117c79692dcde720e5b51..5423d225b6ccf161ba4a91b14851333ecc3725cd 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getAttachedApplicationIncomeList.xml +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getAttachedApplicationIncomeList.xml @@ -58,8 +58,8 @@ \'\'\'\n \n request_income_title_list = context.PDFDocument_getApplicationIncomeDict().keys()\n -sub_object_list = [x.getObject().getTitle() for x in context.searchFolder(validation_state=[\'draft\',\'embedded\'])]\n -return [x for x in sub_object_list if x in request_income_title_list]\n +sub_object_list = [x.getObject() for x in context.searchFolder(validation_state=[\'draft\',\'embedded\'])]\n +return [x for x in sub_object_list if x.getTitle() in request_income_title_list]\n </string> </value> </item> <item> diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getAttachedApplicationOutcomeList.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getAttachedApplicationOutcomeList.xml index 2945fef709cd14b6d64611805f02d74dd3f2b70f..8f0dad7999c732d6b19638abd54989c2cbeaaaee 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getAttachedApplicationOutcomeList.xml +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getAttachedApplicationOutcomeList.xml @@ -58,8 +58,8 @@ \'\'\'\n \n request_outcome_title_list = []\n -sub_object_list = [x.getObject().getTitle() for x in context.searchFolder(validation_state=[\'draft\',\'embedded\'])]\n -return [x for x in sub_object_list if x in request_outcome_title_list]\n +sub_object_list = [x.getObject() for x in context.searchFolder(validation_state=[\'draft\',\'embedded\'])]\n +return [x for x in sub_object_list if x.getTitle() in request_outcome_title_list]\n </string> </value> </item> <item> diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox_application_income.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox_application_income.xml index a9226439b34ebc0942fbd07b4ffe7d7d6156f69f..e96b61405f34236bc721939ceee7d7760f62b90f 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox_application_income.xml +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox_application_income.xml @@ -351,7 +351,7 @@ <string>Title</string> </tuple> <tuple> - <string>getOwner</string> + <string>EGov_getApplicationRequester</string> <string>Actor</string> </tuple> <tuple> @@ -383,6 +383,12 @@ <key> <string>description</string> </key> <value> <string>All attached files add to your application</string> </value> </item> + <item> + <key> <string>display_style_list</string> </key> + <value> + <list/> + </value> + </item> <item> <key> <string>domain_root_list</string> </key> <value> @@ -533,7 +539,7 @@ <string>PDFDocument_getURL</string> </tuple> <tuple> - <string>getOwner</string> + <string>EGov_getApplicationRequester</string> <string>PDFDocument_getURL</string> </tuple> <tuple> diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox_application_outcome.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox_application_outcome.xml index cb522314aeb712628581f23081d07276e4415056..abcc3e3f8a6fd5d90341abcf69f003e801db6dd5 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox_application_outcome.xml +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox_application_outcome.xml @@ -351,7 +351,7 @@ <string>Title</string> </tuple> <tuple> - <string>getOwner</string> + <string>EGov_getApplicationRequester</string> <string>Actor</string> </tuple> <tuple> @@ -383,6 +383,12 @@ <key> <string>description</string> </key> <value> <string>All documents resulting of your application</string> </value> </item> + <item> + <key> <string>display_style_list</string> </key> + <value> + <list/> + </value> + </item> <item> <key> <string>domain_root_list</string> </key> <value> diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewHistory/listbox_application_income.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewHistory/listbox_application_income.xml index a9226439b34ebc0942fbd07b4ffe7d7d6156f69f..e96b61405f34236bc721939ceee7d7760f62b90f 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewHistory/listbox_application_income.xml +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewHistory/listbox_application_income.xml @@ -351,7 +351,7 @@ <string>Title</string> </tuple> <tuple> - <string>getOwner</string> + <string>EGov_getApplicationRequester</string> <string>Actor</string> </tuple> <tuple> @@ -383,6 +383,12 @@ <key> <string>description</string> </key> <value> <string>All attached files add to your application</string> </value> </item> + <item> + <key> <string>display_style_list</string> </key> + <value> + <list/> + </value> + </item> <item> <key> <string>domain_root_list</string> </key> <value> @@ -533,7 +539,7 @@ <string>PDFDocument_getURL</string> </tuple> <tuple> - <string>getOwner</string> + <string>EGov_getApplicationRequester</string> <string>PDFDocument_getURL</string> </tuple> <tuple> diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewHistory/listbox_application_outcome.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewHistory/listbox_application_outcome.xml index cb522314aeb712628581f23081d07276e4415056..0c478bee4425ab512ab9ddd6195a95b3fd44eaac 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewHistory/listbox_application_outcome.xml +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewHistory/listbox_application_outcome.xml @@ -351,7 +351,7 @@ <string>Title</string> </tuple> <tuple> - <string>getOwner</string> + <string>EGov_getApplicationRequester</string> <string>Actor</string> </tuple> <tuple> @@ -383,6 +383,12 @@ <key> <string>description</string> </key> <value> <string>All documents resulting of your application</string> </value> </item> + <item> + <key> <string>display_style_list</string> </key> + <value> + <list/> + </value> + </item> <item> <key> <string>domain_root_list</string> </key> <value> @@ -527,7 +533,24 @@ <item> <key> <string>url_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>title</string> + <string>PDFDocument_getURL</string> + </tuple> + <tuple> + <string>EGov_getApplicationRequester</string> + <string>PDFDocument_getURL</string> + </tuple> + <tuple> + <string>creation_date</string> + <string>PDFDocument_getURL</string> + </tuple> + <tuple> + <string>getTranslatedValidationStateTitle</string> + <string>PDFDocument_getURL</string> + </tuple> + </list> </value> </item> </dictionary> diff --git a/bt5/erp5_egov/bt/change_log b/bt5/erp5_egov/bt/change_log index 656a1761fae1f9b096bb04f8a375dd6a03812c98..22248bb6593fec4c0c4aa5fc9aba7695b2d5e281 100644 --- a/bt5/erp5_egov/bt/change_log +++ b/bt5/erp5_egov/bt/change_log @@ -1,3 +1,6 @@ +2010-07-08 mayoro +* display owner's name in history and date and translated state + 2010-07-08 mohamadou * add a description to the attachment to give the model diff --git a/bt5/erp5_egov/bt/revision b/bt5/erp5_egov/bt/revision index fc67739109ccf85204d8e150c63439ea87bea5c7..0fce07d0e34eb4c36d27c5eb87a2d7d3bcdec849 100644 --- a/bt5/erp5_egov/bt/revision +++ b/bt5/erp5_egov/bt/revision @@ -1 +1 @@ -719 \ No newline at end of file +721 \ No newline at end of file