diff --git a/mysql/data/data_dev.sql b/mysql/data/data_dev.sql index 9bfe100795b..8c405f24ad2 100644 --- a/mysql/data/data_dev.sql +++ b/mysql/data/data_dev.sql @@ -50,7 +50,7 @@ values ('02-12-YHGT',2,now(),'2002-12-01',1,1000,0,196,1196,1,NULL,NULL,''); delete from llx_user; insert into llx_user (name,firstname,code,login,pass,module_comm,module_compta,admin,webcal_login) -values ('Quiedeville','Rodolphe','RQ','rodo','rodo',1,1,1,'rodo'); +values ('Quiedeville','Rodolphe','RQ','rodo','CRnN0Tam/s7z.',1,1,1,'rodo'); insert into llx_user (name,firstname,code,login,pass,module_comm,module_compta,webcal_login) values ('demo','demo','DEMO','demo','demo',1,0,'demo'); diff --git a/mysql/tables/llx_don.sql b/mysql/tables/llx_don.sql index 1a199c5ab6e..a1da92e0147 100644 --- a/mysql/tables/llx_don.sql +++ b/mysql/tables/llx_don.sql @@ -23,9 +23,9 @@ create table llx_don ( rowid integer AUTO_INCREMENT PRIMARY KEY, tms timestamp, - statut smallint, -- etat du don promesse/valid - datec datetime, - datep datetime, -- payment date + fk_statut smallint NOT NULL DEFAULT 0,-- etat du don promesse/valid + datec datetime, -- date de création de l'enregistrement + datedon datetime, -- date du don/promesse amount real default 0, mode varchar(20), nom varchar(255), @@ -36,5 +36,6 @@ create table llx_don public smallint NOT NULL DEFAULT 1, -- le don est-il public (0,1) fk_don_projet integer NOT NULL, -- projet auquel est fait le don fk_user_author integer NOT NULL, + fk_user_valid integer NOT NULL, note text ); diff --git a/mysql/tables/llx_facture.sql b/mysql/tables/llx_facture.sql index 67dae2dd06b..fd5d958ee88 100644 --- a/mysql/tables/llx_facture.sql +++ b/mysql/tables/llx_facture.sql @@ -17,29 +17,25 @@ -- -- $Id$ -- $Source$ --- -- =========================================================================== create table llx_facture ( - rowid integer AUTO_INCREMENT PRIMARY KEY, - facnumber varchar(50) NOT NULL, - fk_soc integer NOT NULL, - datec datetime, -- date de creation de la facture - datef date, -- date de la facture - paye smallint default 0 NOT NULL, - amount real default 0 NOT NULL, - remise real default 0, - tva real default 0, - total real default 0, - fk_statut smallint default 0 NOT NULL, - author varchar(50), - fk_user integer, -- createur de la facture - + rowid integer AUTO_INCREMENT PRIMARY KEY, + facnumber varchar(50) NOT NULL, + fk_soc integer NOT NULL, + datec datetime, -- date de creation de la facture + datef date, -- date de la facture + paye smallint default 0 NOT NULL, + amount real default 0 NOT NULL, + remise real default 0, + tva real default 0, + total real default 0, + fk_statut smallint default 0 NOT NULL, + author varchar(50), + fk_user integer, -- createur de la facture fk_user_author integer, -- createur de la propale - fk_user_valid integer, -- valideur de la propale - note text, UNIQUE INDEX (facnumber) diff --git a/mysql/tables/llx_facturedet.sql b/mysql/tables/llx_facturedet.sql index 416c7ca9f44..3ba6dff0ded 100644 --- a/mysql/tables/llx_facturedet.sql +++ b/mysql/tables/llx_facturedet.sql @@ -1,6 +1,5 @@ -- =================================================================== --- $Id$ --- $Source$ +-- Copyright (C) 2001-2002 Rodolphe Quiedeville -- -- 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 @@ -16,6 +15,8 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- +-- $Id$ +-- $Source$ -- =================================================================== create table llx_facturedet @@ -25,5 +26,6 @@ create table llx_facturedet fk_product integer, datec datetime, note varchar(255), - price smallint + price real default 0 + );