diff --git a/core/trunk/data.sql b/core/trunk/data.sql
index da83258bc919e2aa0c1d9cbfdb106d7c771c5c7d..890563ce9db4589f796f0737d2da0736f16c06dd 100644
--- a/core/trunk/data.sql
+++ b/core/trunk/data.sql
@@ -430,7 +430,7 @@ INSERT INTO parameters (id, param_value_string, param_value_int) VALUES
('postindexing_workbatch', NULL, 40),
('database_version', NULL, 130);
-INSERT INTO templates (id, label, creation_date, template_comment, content) VALUES (2, 'AR_MAARCH', '2009-08-20 16:01:00', 'Accusé de réception Maarch', '<p style="TEXT-ALIGN: left"><img src="img/default_maarch.gif" alt="" width="278" height="80" /> </p>
+INSERT INTO templates (template_id, label, creation_date, template_comment, content) VALUES (2, 'AR_MAARCH', '2009-08-20 16:01:00', 'Accusé de réception Maarch', '<p style="TEXT-ALIGN: left"><img src="img/default_maarch.gif" alt="" width="278" height="80" /> </p>
<p><em><font face="Arial Black" size="2" color="#3366ff">La gestion de courriers Open source !</font></em><br />Mail : info@maarch.org<br />Web : http://www.maarch.org</p>
<p style="TEXT-ALIGN: right"><font size="2">Nanterre, le [NOW]</font></p>
<p><font size="2">Cher [CONTACT_LASTNAME]</font></p>
@@ -442,7 +442,7 @@ INSERT INTO templates (id, label, creation_date, template_comment, content) VALU
<p><font size="2"> Cordialement,</font></p>
<p><font size="2"><em> [CURRENT_USER_FIRSTNAME] [CURRENT_USER_LASTNAME]<br /> [DESTINATION]<br /> Tél : [CURRENT_USER_PHONE]<br /> Courriel : [CURRENT_USER_EMAIL]</em></font></p>
<p> </p>');
-INSERT INTO templates (id, label, creation_date, template_comment, content) VALUES (1, 'TEST', '2009-08-20 16:01:00', 'Test des mots-clés', '<h1>Liste des mots-clés utilisables dans les modèles de reponse</h1>
+INSERT INTO templates (template_id, label, creation_date, template_comment, content) VALUES (1, 'TEST', '2009-08-20 16:01:00', 'Test des mots-clés', '<h1>Liste des mots-clés utilisables dans les modèles de reponse</h1>
<p> </p>
<table border="0">
<tbody>
@@ -569,7 +569,7 @@ INSERT INTO templates (id, label, creation_date, template_comment, content) VALU
</tbody>
</table>
<p><font size="2"> </font></p>');
-INSERT INTO templates (id, label, creation_date, template_comment, content) VALUES (3, 'AppelTel', '2011-06-06 11:38:48.126', 'Appel téléphonique', '<p><font size="\\"5\\""><strong>APPEL TELEPHONIQUE</strong></font></p>
+INSERT INTO templates (template_id, label, creation_date, template_comment, content) VALUES (3, 'AppelTel', '2011-06-06 11:38:48.126', 'Appel téléphonique', '<p><font size="\\"5\\""><strong>APPEL TELEPHONIQUE</strong></font></p>
<p><font size="\\"2\\"">Bonjour,</font></p>
<p><font size="\\"2\\"">Vous avez reçu un appel téléphonique dont voici les informations :</font></p>
<ul>
@@ -579,12 +579,12 @@ INSERT INTO templates (id, label, creation_date, template_comment, content) VALU
<li><font size="\\"2\\"">Contact :</font></li>
</ul>
<p><font size="\\"2\\"">Notes : </font></p>');
-INSERT INTO templates (id, label, creation_date, template_comment, content) VALUES (20, 'Notifications événement', '2012-01-27 10:41:34.237', 'Test des notifications événements système', '<p>{#translate._HELLO} {#mergefield.recipient.firstname} {#mergefield.recipient.lastname},</p>
+INSERT INTO templates (template_id, label, creation_date, template_comment, content) VALUES (20, 'Notifications événement', '2012-01-27 10:41:34.237', 'Test des notifications événements système', '<p>{#translate._HELLO} {#mergefield.recipient.firstname} {#mergefield.recipient.lastname},</p>
<p> </p>
<p>Voici la liste des événements {#mergefield.template_association.description} :</p>
<p> </p>
<p>{#mergetable.evenements}</p>');
-INSERT INTO templates (id, label, creation_date, template_comment, content) VALUES (21, 'Diffusion de courrier', '2012-02-06 10:14:49.088', 'Notification de diffusion de courrier', '<p>Bonjour {#mergefield.recipient.firstname} {#mergefield.recipient.lastname},</p>
+INSERT INTO templates (template_id, label, creation_date, template_comment, content) VALUES (21, 'Diffusion de courrier', '2012-02-06 10:14:49.088', 'Notification de diffusion de courrier', '<p>Bonjour {#mergefield.recipient.firstname} {#mergefield.recipient.lastname},</p>
<p> </p>
<p>Voici la liste des courriers qui vous ont été envoyés :</p>
<p> </p>
diff --git a/core/trunk/data_mlb.sql b/core/trunk/data_mlb.sql
index cc7a46b0348e8f94b5f4f441c3e72a6a3c9260db..ff4ffb2bfb06e2420ac6188f6764a84b650d3cce 100644
--- a/core/trunk/data_mlb.sql
+++ b/core/trunk/data_mlb.sql
@@ -624,7 +624,7 @@ INSERT INTO security (security_id, group_id, coll_id, where_clause, maarch_comme
-- Modèles et notification
--
-INSERT INTO templates (id, label, creation_date, template_comment, content) VALUES (2, 'AR_MAARCH', '2009-08-20 16:01:00', 'Accusé de réception Maarch', '<p style="TEXT-ALIGN: left"><img src="img/default_maarch.gif" alt="" width="278" height="80" /> </p>
+INSERT INTO templates (template_id, label, creation_date, template_comment, content) VALUES (2, 'AR_MAARCH', '2009-08-20 16:01:00', 'Accusé de réception Maarch', '<p style="TEXT-ALIGN: left"><img src="img/default_maarch.gif" alt="" width="278" height="80" /> </p>
<p><em><font face="Arial Black" size="2" color="#3366ff">La gestion de courriers Open source !</font></em><br />Mail : info@maarch.org<br />Web : http://www.maarch.org</p>
<p style="TEXT-ALIGN: right"><font size="2">Nanterre, le [NOW]</font></p>
<p><font size="2">Cher [CONTACT_LASTNAME]</font></p>
@@ -636,7 +636,7 @@ INSERT INTO templates (id, label, creation_date, template_comment, content) VALU
<p><font size="2"> Cordialement,</font></p>
<p><font size="2"><em> [CURRENT_USER_FIRSTNAME] [CURRENT_USER_LASTNAME]<br /> [DESTINATION]<br /> Tél : [CURRENT_USER_PHONE]<br /> Courriel : [CURRENT_USER_EMAIL]</em></font></p>
<p> </p>');
-INSERT INTO templates (id, label, creation_date, template_comment, content) VALUES (1, 'TEST', '2009-08-20 16:01:00', 'Test des mots-clés', '<h1>Liste des mots-clés utilisables dans les modèles de reponse</h1>
+INSERT INTO templates (template_id, label, creation_date, template_comment, content) VALUES (1, 'TEST', '2009-08-20 16:01:00', 'Test des mots-clés', '<h1>Liste des mots-clés utilisables dans les modèles de reponse</h1>
<p> </p>
<table border="0">
<tbody>
@@ -763,7 +763,7 @@ INSERT INTO templates (id, label, creation_date, template_comment, content) VALU
</tbody>
</table>
<p><font size="2"> </font></p>');
-INSERT INTO templates (id, label, creation_date, template_comment, content) VALUES (3, 'AppelTel', '2011-06-06 11:38:48.126', 'Appel téléphonique', '<p><font size="\\"5\\""><strong>APPEL TELEPHONIQUE</strong></font></p>
+INSERT INTO templates (template_id, label, creation_date, template_comment, content) VALUES (3, 'AppelTel', '2011-06-06 11:38:48.126', 'Appel téléphonique', '<p><font size="\\"5\\""><strong>APPEL TELEPHONIQUE</strong></font></p>
<p><font size="\\"2\\"">Bonjour,</font></p>
<p><font size="\\"2\\"">Vous avez reçu un appel téléphonique dont voici les informations :</font></p>
<ul>
@@ -773,12 +773,12 @@ INSERT INTO templates (id, label, creation_date, template_comment, content) VALU
<li><font size="\\"2\\"">Contact :</font></li>
</ul>
<p><font size="\\"2\\"">Notes : </font></p>');
-INSERT INTO templates (id, label, creation_date, template_comment, content) VALUES (20, 'Notifications événement', '2012-01-27 10:41:34.237', 'Test des notifications événements système', '<p>{#translate._HELLO} {#mergefield.recipient.firstname} {#mergefield.recipient.lastname},</p>
+INSERT INTO templates (template_id, label, creation_date, template_comment, content) VALUES (20, 'Notifications événement', '2012-01-27 10:41:34.237', 'Test des notifications événements système', '<p>{#translate._HELLO} {#mergefield.recipient.firstname} {#mergefield.recipient.lastname},</p>
<p> </p>
<p>Voici la liste des événements {#mergefield.template_association.description} :</p>
<p> </p>
<p>{#mergetable.evenements}</p>');
-INSERT INTO templates (id, label, creation_date, template_comment, content) VALUES (21, 'Diffusion de courrier', '2012-02-06 10:14:49.088', 'Notification de diffusion de courrier', '<p>Bonjour {#mergefield.recipient.firstname} {#mergefield.recipient.lastname},</p>
+INSERT INTO templates (template_id, label, creation_date, template_comment, content) VALUES (21, 'Diffusion de courrier', '2012-02-06 10:14:49.088', 'Notification de diffusion de courrier', '<p>Bonjour {#mergefield.recipient.firstname} {#mergefield.recipient.lastname},</p>
<p> </p>
<p>Voici la liste des courriers qui vous ont été envoyés :</p>
<p> </p>
diff --git a/core/trunk/structure.sql b/core/trunk/structure.sql
index 7010886eb8cd3aac46aa9155ad28b18c098808f6..5483caf964e6f0dc4bed51e1bbec5c91104e7e99 100644
--- a/core/trunk/structure.sql
+++ b/core/trunk/structure.sql
@@ -1400,14 +1400,14 @@ CREATE SEQUENCE templates_association_seq
CREATE TABLE templates
(
- id bigint NOT NULL DEFAULT nextval('templates_seq'::regclass),
+ template_id bigint NOT NULL DEFAULT nextval('templates_seq'::regclass),
label character varying(50) DEFAULT NULL::character varying,
creation_date timestamp without time zone,
"template_comment" character varying(255) DEFAULT NULL::character varying,
"content" text,
model_type character varying(32) NOT NULL DEFAULT 'HTML'::character varying,
style_name character varying(255),
- CONSTRAINT templates_pkey PRIMARY KEY (id)
+ CONSTRAINT templates_pkey PRIMARY KEY (template_id)
)
WITH (OIDS=FALSE);