@@ -46,1 +47,4 @@
 
+    def get_templates_form(self):
+        form = super().get_templates_form()
+        if not get_publisher().has_site_option('enable-card-identifier-template'):

@@ -47,0 +56,4 @@
+        kwargs = {}
+        if self.formdef.data_class().exists(criterias):
+            kwargs['readonly'] = True
+            kwargs['hint'] = _('Identifier cannot be modified if there are existing cards.')

@@ -47,0 +60,4 @@
+        form.add(
+            StringWidget,
+            'id_template',
+            title=_('Unique identifier template'),

@@ -408,3 +408,3 @@
     form_page_class = CardFillPage
 
-    sidebar_recorded_message = _('The card has been recorded on %(date)s with the number %(number)s.')
+    sidebar_recorded_message = _('The card has been recorded on %(date)s with the identifier %(identifier)s.')

@@ -1812,3 +1812,3 @@
 
     def get_formdef_fields(self, include_block_items_fields=False):
-        yield FakeField('id', 'id', _('Number'))
+        yield FakeField('id', 'id', _('Identifier') if self.formdef.id_template else _('Number'))

@@ -3266,3 +3266,3 @@
     form_page_class = FormBackofficeEditPage
 
-    sidebar_recorded_message = _('The form has been recorded on %(date)s with the number %(number)s.')
+    sidebar_recorded_message = _('The form has been recorded on %(date)s with the number %(identifier)s.')

@@ -42,0 +42,4 @@
+    @classmethod
+    def get_by_id(cls, value):
+        try:
+            return cls.select([cls._formdef.get_by_id_criteria(value)], limit=1)[0]

@@ -145,1 +145,4 @@
 
+    def get_by_id_criteria(self, value):
+        if self.id_template:
+            return Equal('id_display', value)

@@ -146,0 +153,4 @@
+        except ValueError:
+            # value not an integer, it could be id_display
+            return Equal('id_display', value)
+        return Equal('id', value)

@@ -248,3 +254,1 @@
-                criterias.append(Equal('id_display', get_by_id))
-            else:
-                criterias.append(Equal('id', get_by_id))
+                criterias.append(carddef.get_by_id_criteria(get_by_id))

@@ -385,3 +385,3 @@
             return value
         try:
-            carddata = carddef.data_class().get(value_id)
+            carddata = carddef.data_class().get_by_id(value_id)

@@ -491,1 +494,4 @@
+            # unless a specific template is defined, only set id_display once
+            # as it may have been set automatically by interpreting a webservice
+            # response.
             fields['id_display'] = self.formdef.get_display_id_format().strip()

@@ -1807,2 +1805,2 @@
-                        carddef_table_alias,
-                    )
+                    if field.carddef.id_template:
+                        carddef_table_decl = 'LEFT JOIN %s AS %s ON (%s.%s = %s.id_display)' % (

@@ -1809,0 +1811,4 @@
+                            carddef_table_alias,
+                        )
+                    else:
+                        carddef_table_decl = 'LEFT JOIN %s AS %s ON (CAST(%s.%s AS INTEGER) = %s.id)' % (

@@ -761,1 +761,3 @@
-    for attr in ('receipt_time', 'anonymised', 'user_id', 'status'):
+    attrs = ['receipt_time', 'anonymised', 'user_id', 'status']
+    if isinstance(formdef, CardDef):
+        attrs.append('id_display')

@@ -47,0 +51,4 @@
+            return form
+        criterias = [
+            StrictNotEqual('status', 'draft'),
+            Null('anonymised'),

@@ -5219,6 +5231,7 @@ def migrate():
         # 45 & 46: add index on formdata(status)
         # 56: add GIN indexes to concerned_roles_array and actions_roles_array
         # 74: (late migration) change evolution index to be on (fomdata_id, id)
+        # 97: add index on carddata/id_display