diff --git a/htdocs/pre.inc.php b/htdocs/pre.inc.php index 5f7784e6666..0978244c8b6 100644 --- a/htdocs/pre.inc.php +++ b/htdocs/pre.inc.php @@ -2,6 +2,8 @@ /* Copyright (C) 2001-2004 Rodolphe Quiedeville * Copyright (C) 2003 Éric Seigne * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004 Benoit Mortier + * Copyright (C) 2004 Guillaume Delecourt * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,10 +32,6 @@ function llxHeader($head = "") { $user->getrights('propale'); $user->getrights('facture'); - /* - * - * - */ top_menu($head); $menu = new Menu(); @@ -58,7 +56,8 @@ function llxHeader($head = "") { $menu->add_submenu(DOL_URL_ROOT."/comm/clients.php",$langs->trans("Customers")); $menu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php",$langs->trans("Prospects")); - + $menu->add_submenu(DOL_URL_ROOT."/comm/mailing.php","Mailing"); + if ($user->rights->propale->lire) $menu->add_submenu(DOL_URL_ROOT."/comm/propal.php", "Prop. commerciales"); } diff --git a/mysql/data/data.sql b/mysql/data/data.sql index d9b7dc4cf70..3d23d5c155b 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -1,6 +1,8 @@ -- Copyright (C) 2001-2004 Rodolphe Quiedeville -- Copyright (C) 2003 Jean-Louis Bergamo -- Copyright (C) 2004 Laurent Destailleur +-- Copyright (C) 2004 Benoit Mortier +-- Copyright (C) 2004 Guillaume Delecourt -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -96,6 +98,12 @@ insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_ insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_COTIS_SUBJECT','Recu de votre cotisation','chaine','sujet du mail de validation de cotisation',0); insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_NEW_SUBJECT','Bienvenue sur %SERVEUR%','chaine','Sujet du mail de nouvelle adhesion',0); insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_EDIT_SUBJECT','Votre fiche a ete editee sur %SERVEUR%','chaine','Sujet du mail d\'edition',0); + +-- +-- Mail Mailing +-- +insert into llx_const (name, value, type, note) values ('MAILING_EMAIL','mailing@societe.com','chaine','Champ From du mail pour mailing clients/prospects',0); + -- -- Mailman -- diff --git a/mysql/tables/llx_action_def.sql b/mysql/tables/llx_action_def.sql index 59a9c89cdc4..f35ae12aae9 100644 --- a/mysql/tables/llx_action_def.sql +++ b/mysql/tables/llx_action_def.sql @@ -1,5 +1,7 @@ -- =================================================================== -- Copyright (C) 2003 Rodolphe Quiedeville +-- Copyright (C) 2004 Benoit Mortier +-- Copyright (C) 2004 Guillaume Delecourt -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -26,5 +28,5 @@ create table llx_action_def tms timestamp, titre varchar(255) NOT NULL, description text, - objet_type enum('ficheinter','facture','propale') + objet_type enum('ficheinter','facture','propale','mailing') )type=innodb; diff --git a/pgsql/data/data.sql b/pgsql/data/data.sql index e2b3e8f39e8..54fca829c3f 100644 --- a/pgsql/data/data.sql +++ b/pgsql/data/data.sql @@ -1,5 +1,6 @@ -- Copyright (C) 2001-2002 Rodolphe Quiedeville --- Copyright (C) 2004 Benoit Mortier +-- Copyright (C) 2004 Benoit Mortier +-- Copyright (C) 2004 Guillaume Delecourt -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -103,6 +104,12 @@ insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_ insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_NEW_SUBJECT','Bienvenue sur %SERVEUR%','chaine','Sujet du mail de nouvelle adhesion',0); insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_EDIT_SUBJECT','Votre fiche a ete editee sur %SERVEUR%','chaine','Sujet du mail d\'edition',0); +-- +-- Mail Mailing +-- + +insert into llx_const (name, value, type, note) values ('MAILING_EMAIL','mailing@societe.com','chaine','Champ From du mail pour mailing clients/prospects',0); + -- -- Mailman -- diff --git a/pgsql/tables/llx_action_def.sql b/pgsql/tables/llx_action_def.sql index c22ba65f8f4..7635e707d85 100644 --- a/pgsql/tables/llx_action_def.sql +++ b/pgsql/tables/llx_action_def.sql @@ -1,6 +1,7 @@ -- =================================================================== -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2004 Benoit Mortier +-- Copyright (C) 2004 Benoit Mortier +-- Copyright (C) 2004 Guillaume Delecourt -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -27,5 +28,5 @@ create table llx_action_def tms timestamp, titre varchar(255) NOT NULL, description text, - objet_type CHAR(10) CHECK (objet_type IN ('ficheinter','facture','propale')) + objet_type CHAR(10) CHECK (objet_type IN ('ficheinter','facture','propale','mailing')) );