diff --git a/core/trunk/structure.sql b/core/trunk/structure.sql
index 8a90a288c33e14e41e2ed3e44c3bf643a5a1980e..239a12efdc060a9373c40d223f0fa13310f28435 100644
--- a/core/trunk/structure.sql
+++ b/core/trunk/structure.sql
@@ -1134,6 +1134,31 @@ WITH (OIDS=FALSE);
 
 
 -- modules/notes/sql/structure/notifications.postgresql.sql
+CREATE SEQUENCE notifications_seq
+  INCREMENT 1
+  MINVALUE 1
+  MAXVALUE 9223372036854775807
+  START 1
+  CACHE 1;
+
+CREATE TABLE notifications
+(
+  notification_sid bigint NOT NULL DEFAULT nextval('notifications_seq'::regclass),
+  notification_id character varying(50) NOT NULL,
+  description character varying(255),
+  event_id character varying(255) NOT NULL,
+  notification_mode character varying(30) NOT NULL,
+  template_id bigint,
+  diffusion_type character varying(50) NOT NULL,
+  diffusion_properties character varying(255),
+  attachfor_type character varying(50),
+  attachfor_properties character varying(255),
+  CONSTRAINT notifications_pkey PRIMARY KEY (notification_sid)
+)
+WITH (
+  OIDS=FALSE
+);
+
 
 CREATE SEQUENCE notif_event_stack_seq
   INCREMENT 1
@@ -1142,10 +1167,11 @@ CREATE SEQUENCE notif_event_stack_seq
   START 1
   CACHE 1;
 
+ -- DROP TABLE notif_event_stack
 CREATE TABLE notif_event_stack
 (
-  system_id bigint NOT NULL DEFAULT nextval('notif_event_stack_seq'::regclass),
-  ta_sid bigint NOT NULL,
+  event_stack_sid bigint NOT NULL DEFAULT nextval('notif_event_stack_seq'::regclass),
+  notif_sid bigint NOT NULL,
   table_name character varying(50) NOT NULL,
   record_id character varying(50) NOT NULL,
   user_id character varying(128) NOT NULL,
@@ -1153,7 +1179,7 @@ CREATE TABLE notif_event_stack
   event_date timestamp without time zone NOT NULL,
   exec_date timestamp without time zone,
   exec_result character varying(50),
-  CONSTRAINT notif_event_stack_pkey PRIMARY KEY (system_id)
+  CONSTRAINT notif_event_stack_pkey PRIMARY KEY (event_stack_sid)
 )
 WITH (
   OIDS=FALSE
@@ -1166,9 +1192,10 @@ CREATE SEQUENCE notif_email_stack_seq
   START 1
   CACHE 1;
 
+ -- DROP TABLE notif_email_stack
 CREATE TABLE notif_email_stack
 (
-  system_id bigint NOT NULL DEFAULT nextval('notif_email_stack_seq'::regclass),
+  email_stack_sid bigint NOT NULL DEFAULT nextval('notif_email_stack_seq'::regclass),
   sender character varying(255) NOT NULL,
   reply_to character varying(255),
   recipient character varying(2000) NOT NULL,
@@ -1182,7 +1209,7 @@ CREATE TABLE notif_email_stack
   module character varying(50) NOT NULL,
   exec_date timestamp without time zone,
   exec_result character varying(50),
-  CONSTRAINT notif_email_stack_pkey PRIMARY KEY (system_id)
+  CONSTRAINT notif_email_stack_pkey PRIMARY KEY (email_stack_sid)
 )
 WITH (
   OIDS=FALSE
@@ -1375,12 +1402,6 @@ CREATE TABLE templates_association
   what character varying(255) NOT NULL,
   value_field character varying(255) NOT NULL,
   maarch_module character varying(255) NOT NULL DEFAULT 'apps'::character varying,
-  notification_id character varying(50),
-  description character varying(255),
-  diffusion_type character varying(50),
-  diffusion_properties character varying(255),
-  attachfor_type character varying(50),
-  attachfor_properties character varying(255),
   CONSTRAINT templates_association_pkey PRIMARY KEY (system_id)
 )
 WITH (