From 4cd5a2bc4dfd821d1d179c04df8cf7a0c1accafb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com> Date: Wed, 13 Jun 2007 10:50:58 +0000 Subject: [PATCH] when generating reference, do not reuse old one as it can lead to strange reference generation if reference depends on a parameter the user can play with git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14805 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_banking_core/Baobab_getUniqueReference.xml | 12 ++++++++---- bt5/erp5_banking_core/bt/revision | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUniqueReference.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUniqueReference.xml index 412c9106e2..3f59507058 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUniqueReference.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUniqueReference.xml @@ -102,12 +102,15 @@ if reference in (None, \'\') or not str(reference).startswith(application_id):\n return \'\'\n \n # actual generation\n - if reference in (None, \'\'):\n - baobab_id_group = (application_id, codification, year)\n - reference = context.portal_ids.generateNewLengthId(id_group = baobab_id_group)\n + #if reference in (None, \'\'): \n + #XXX is it necessary to concatenate to an old reference ?\n + # this make reference look strange when using different script to\n + # generate reference based on criteria the user can play with\n + baobab_id_group = (application_id, codification, year)\n + new_id = context.portal_ids.generateNewLengthId(id_group = baobab_id_group)\n \n # affectation\n - reference = "%s-%s-%s-%s" % (application_id, codification, year, reference)\n + reference = "%s-%s-%s-%s" % (application_id, codification, year, new_id)\n context.setSourceReference(reference)\n \n # finally, return it\n @@ -179,6 +182,7 @@ return reference\n <string>site</string> <string>site_value</string> <string>baobab_id_group</string> + <string>new_id</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_core/bt/revision b/bt5/erp5_banking_core/bt/revision index 8bc94cb760..6610e117a3 100644 --- a/bt5/erp5_banking_core/bt/revision +++ b/bt5/erp5_banking_core/bt/revision @@ -1 +1 @@ -276 \ No newline at end of file +277 \ No newline at end of file -- 2.30.9