Create beta 2.4

htdocs/install/inc.php

@@ -24,7 +24,7 @@
 		\version    $Id$
 */
 
-define('DOL_VERSION','2.4-dev');	// Also defined in master.inc.php
+define('DOL_VERSION','2.4-beta');	// Also defined in htdocs/master.inc.php
 
 require_once('../translate.class.php');
 require_once('../lib/functions.lib.php');

htdocs/master.inc.php

@@ -29,7 +29,7 @@
    \version    $Id$
 */
 
-define('DOL_VERSION','2.4-dev');	// Also defined in inc.php
+define('DOL_VERSION','2.4-beta');	// Also defined in htdocs/install/inc.php
 define('EURO',chr(128)); 
 
 // La fonction clearstatcache ne doit pas etre appelée de manière globale car ralenti.

pgsql/tables/llx_actioncomm.sql

@@ -20,7 +20,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_actioncomm.sql,v 1.11 2007/12/02 21:51:12 eldy Exp 
+-- Id: llx_actioncomm.sql,v 1.13 2008/02/11 15:51:04 eldy Exp 
 --
 -- Actions commerciales
 -- ========================================================================
@@ -29,23 +29,27 @@
 
 
 
+
+
 create table llx_actioncomm
 (
   id SERIAL PRIMARY KEY,
-  "datec"          timestamp,             -- date creation
   "datep"          timestamp,             -- date debut planifiee
   "datep2"         timestamp,             -- date fin planifiee si action non ponctuelle
   "datea"          timestamp,             -- date debut realisation
   "datea2"         timestamp,             -- date fin realisation si action non ponctuelle
-  "tms"            timestamp,            -- date modif
   "fk_action"      integer,              -- type de l'action
   "label"          varchar(50) NOT NULL, -- libelle de l'action
+  "datec"          timestamp,             -- date creation
+  "tms"            timestamp,            -- date modif
+  "fk_user_author" integer,              -- id user qui a cree l'action
+  "fk_user_mod"    integer,              -- id dernier user qui a modifier l'action
   "fk_project"     integer,
   "fk_soc"         integer,
   "fk_contact"     integer,
   "fk_parent"      integer NOT NULL default 0,
   "fk_user_action" integer,              -- id de la personne qui doit effectuer l'action
-  "fk_user_author" integer,              -- id de la personne qui a effectuer l'action
+  "fk_user_done"   integer,              -- id de la personne qui a effectue l'action
   "priority"       smallint,
   "punctual"       smallint NOT NULL default 1,
   "percent"        smallint NOT NULL default 0,

pgsql/tables/llx_adherent.sql

@@ -21,7 +21,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_adherent.sql,v 1.21 2007/12/02 21:51:12 eldy Exp 
+-- Id: llx_adherent.sql,v 1.22 2008/05/17 22:17:29 eldy Exp 
 -- ===================================================================
 --
 -- statut
@@ -57,8 +57,8 @@ create table llx_adherent
   "datec"            timestamp,  -- date de creation
   "tms"              timestamp, -- date de modification
   "fk_user_author"   integer NOT NULL,
-  "fk_user_mod"      integer NOT NULL,
+  "fk_user_mod"      integer,
-  "fk_user_valid"    integer NOT NULL, 
+  "fk_user_valid"    integer, 
   UNIQUE(login)
 );
 

pgsql/tables/llx_bank.sql

@@ -4,7 +4,7 @@
 
 -- ===================================================================
 -- Copyright (C) 2000-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
 --
 -- 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
@@ -20,7 +20,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_bank.sql,v 1.11 2007/12/02 21:53:28 eldy Exp 
+-- Id: llx_bank.sql,v 1.12 2008/05/02 23:09:44 eldy Exp 
 -- ===================================================================
 
 create table llx_bank
@@ -36,7 +36,7 @@ create table llx_bank
   "fk_user_rappro"  integer,
   "fk_type"         varchar(4),     -- CB, Virement, cheque
   "num_releve"      varchar(50),
-  "num_chq"         int,
+  "num_chq"         varchar(50),
   "rappro"          smallint default 0,
   "note"            text,
   "fk_bordereau"    integer DEFAULT 0,

pgsql/tables/llx_boxes_def.sql

@@ -19,13 +19,13 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_boxes_def.sql,v 1.5 2007/12/02 21:53:29 eldy Exp 
+-- Id: llx_boxes_def.sql,v 1.6 2008/01/08 19:54:55 eldy Exp 
 -- ===========================================================================
 
 create table llx_boxes_def
 (
   rowid SERIAL PRIMARY KEY,
-  "name"        varchar(255) NOT NULL,
   "file"        varchar(255) NOT NULL,
+  "tms"         timestamp,
   "note"        text
 );

pgsql/tables/llx_c_barcode_type.sql

@@ -19,7 +19,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_c_barcode_type.sql,v 1.3 2007/12/02 21:57:09 eldy Exp 
+-- Id: llx_c_barcode_type.sql,v 1.4 2008/01/03 18:41:34 eldy Exp 
 -- ========================================================================
 
 create table llx_c_barcode
@@ -27,6 +27,6 @@ create table llx_c_barcode
   rowid SERIAL PRIMARY KEY,
   "code"     varchar(16)        NOT NULL,
   "libelle"  varchar(50)        NOT NULL,
-  "coder"    integer            NOT NULL DEFAULT 0,
+  "coder"    varchar(16)        NOT NULL,
   "example"  varchar(16)        NOT NULL
 );

pgsql/tables/llx_c_forme_juridique.sql

@@ -20,16 +20,17 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_c_forme_juridique.sql,v 1.8 2007/12/02 21:57:09 eldy Exp 
+-- Id: llx_c_forme_juridique.sql,v 1.9 2008/02/17 15:20:48 eldy Exp 
 -- ========================================================================
 
 
 create table llx_c_forme_juridique
 (
   rowid SERIAL PRIMARY KEY,
-  "code"       varchar(12)   UNIQUE NOT NULL,
+  "code"       	varchar(12)   UNIQUE NOT NULL,
-  "fk_pays"    integer       NOT NULL,
+  "fk_pays"    	integer       NOT NULL,
-  "libelle"    varchar(255),
+  "libelle"    	varchar(255),
-  "active"     smallint DEFAULT 1  NOT NULL
+  "isvatexempted"	smallint DEFAULT 0  NOT NULL,
+  "active"     	smallint DEFAULT 1  NOT NULL
 );
 

pgsql/tables/llx_c_prospectlevel.sql

@@ -0,0 +1,32 @@
+-- Generated by dolibarr_mysql2pgsql
+-- (c) 2004, PostgreSQL Inc.
+-- (c) 2005, Laurent Destailleur.
+
+-- ===================================================================
+-- Copyright (C) 2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- 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
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- Id: llx_c_prospectlevel.sql,v 1.1 2008/03/01 01:13:17 eldy Exp 
+-- ===================================================================
+
+create table llx_c_prospectlevel
+(
+  code            varchar(12) PRIMARY KEY,
+  "label"           varchar(30),
+  "sortorder"       smallint,
+  "active"          smallint    DEFAULT 1 NOT NULL
+);
+

pgsql/tables/llx_c_type_fees.sql

@@ -3,7 +3,8 @@
 -- (c) 2005, Laurent Destailleur.
 
 -- ========================================================================
--- Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
 --
 -- 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
@@ -19,17 +20,13 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_societe_perms.sql,v 1.4 2007/12/02 21:37:47 eldy Exp 
+-- Id: llx_c_type_fees.sql,v 1.1 2008/05/26 00:03:52 eldy Exp 
 -- ========================================================================
 
-
+create table llx_c_type_fees
-create table llx_societe_perms
 (
-  "fk_soc"    integer,
+  id SERIAL PRIMARY KEY,
-  "fk_user"   integer,
+  "code"      varchar(12)  UNIQUE NOT NULL,
-  "pread"     smallint DEFAULT 0, -- permission de lecture
+  "libelle"   varchar(30),
-  "pwrite"    smallint DEFAULT 0, -- permission d'ecriture
+  "active"    smallint DEFAULT 1   NOT NULL
-  "pperms"    smallint DEFAULT 0, -- permission sur les permissions
-  UNIQUE(fk_soc, fk_user)
 );
-

pgsql/tables/llx_c_typent.sql

@@ -23,17 +23,7 @@
 -- Id: llx_c_typent.sql,v 1.6 2007/12/02 21:57:10 eldy Exp 
 -- ========================================================================
 
-CREATE TABLE llx_surveys_answers_summary (
+create table llx_c_typent
-  fk_question       integer PRIMARY KEY,
-  "nb_rep1"           decimal(10,0) NOT NULL default '0',
-  "nb_rep2"           decimal(10,0) default NULL,
-  "nb_rep3"           decimal(10,0) default NULL,
-  "nb_rep4"           decimal(10,0) default NULL,
-  "tot_rep1"          decimal(10,0) NOT NULL default '0',
-  "tot_rep2"          decimal(10,0) default NULL,
-  "tot_rep3"          decimal(10,0) default NULL,
-  "tot_rep4"          decimal(10,0) default NULL
-")""create" table llx_c_typent
 (
   id        integer      PRIMARY KEY,
   "code"      varchar(12)  UNIQUE NOT NULL,

pgsql/tables/llx_chargesociales.sql

@@ -19,9 +19,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_chargesociales.sql,v 1.7 2007/11/27 05:20:53 eldy Exp 
+-- Id: llx_chargesociales.sql,v 1.8 2007/12/16 20:40:10 eldy Exp 
--- $Source$
---
 -- ========================================================================
 
 create table llx_chargesociales

pgsql/tables/llx_co_exp.sql

@@ -0,0 +1,35 @@
+-- Generated by dolibarr_mysql2pgsql
+-- (c) 2004, PostgreSQL Inc.
+-- (c) 2005, Laurent Destailleur.
+
+-- ===================================================================
+-- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2008 Regis Houssin        <regis@dolibarr.fr>
+--
+-- 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
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- Id: llx_co_exp.sql,v 1.1 2008/01/17 10:28:28 hregis Exp 
+-- ===================================================================
+
+
+create table llx_co_exp
+(
+  rowid SERIAL PRIMARY KEY,
+  "fk_commande"   integer NOT NULL,
+  "fk_expedition" integer NOT NULL
+);
+
+CREATE INDEX idx_llx_co_exp_fk_commande ON llx_co_exp (fk_commande);
+CREATE INDEX idx_llx_co_exp_fk_expedition ON llx_co_exp (fk_expedition);

pgsql/tables/llx_co_liv.sql

@@ -0,0 +1,35 @@
+-- Generated by dolibarr_mysql2pgsql
+-- (c) 2004, PostgreSQL Inc.
+-- (c) 2005, Laurent Destailleur.
+
+-- ===================================================================
+-- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2008 Regis Houssin        <regis@dolibarr.fr>
+--
+-- 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
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- Id: llx_co_liv.sql,v 1.1 2008/01/21 19:20:24 hregis Exp 
+-- ===================================================================
+
+
+create table llx_co_liv
+(
+  rowid SERIAL PRIMARY KEY,
+  "fk_commande"   integer NOT NULL,
+  "fk_livraison"  integer NOT NULL
+);
+
+CREATE INDEX idx_llx_co_liv_fk_commande ON llx_co_liv (fk_commande);
+CREATE INDEX idx_llx_co_liv_fk_livraison ON llx_co_liv (fk_livraison);

pgsql/tables/llx_commande.sql

@@ -19,7 +19,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_commande.sql,v 1.15 2007/12/02 22:03:23 eldy Exp 
+-- Id: llx_commande.sql,v 1.16 2008/01/21 19:17:56 hregis Exp 
 -- ===================================================================
 
 
@@ -55,7 +55,7 @@ create table llx_commande
   "facture"               smallint   default 0,
   "fk_cond_reglement"     integer,                       -- condition de réglement
   "fk_mode_reglement"     integer,                       -- mode de réglement
-  "date_livraison" 	    date 	  default NULL,
+  "date_livraison" 	      date 	  default NULL,
   "fk_adresse_livraison"  integer,                       -- adresse de livraison
   UNIQUE(ref)
 );

pgsql/tables/llx_commande_fournisseurdet.sql

@@ -20,7 +20,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_commande_fournisseurdet.sql,v 1.9 2007/12/14 19:44:05 hregis Exp 
+-- Id: llx_commande_fournisseurdet.sql,v 1.10 2008/05/09 09:08:52 hregis Exp 
 -- ===================================================================
 
 create table llx_commande_fournisseurdet
@@ -35,7 +35,6 @@ create table llx_commande_fournisseurdet
   "qty"                        real,                      -- quantité
   "remise_percent"             real         DEFAULT 0,    -- pourcentage de remise
   "remise"                     real         DEFAULT 0,    -- montant de la remise
-  "price"                      real,                      -- prix final
   "subprice"                   real(24,8) DEFAULT 0,    -- prix unitaire
   "total_ht"                   real(24,8) DEFAULT 0,    -- Total HT de la ligne toute quantité et incluant remise ligne et globale
   "total_tva"                  real(24,8) DEFAULT 0,	  -- Total TVA de la ligne toute quantité et incluant remise ligne et globale

pgsql/tables/llx_commandedet.sql

@@ -20,7 +20,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_commandedet.sql,v 1.15 2007/12/02 22:03:23 eldy Exp 
+-- Id: llx_commandedet.sql,v 1.16 2008/01/09 09:48:23 hregis Exp 
 -- ===================================================================
 
 create table llx_commandedet
@@ -51,4 +51,5 @@ create table llx_commandedet
 --
 -- 1 : frais de port
 -- 2 : ecotaxe
+-- 3 : produit/service propose en option
 --

pgsql/tables/llx_compta_account.sql

@@ -5,9 +5,6 @@
 -- ===================================================================
 -- Copyright (C) 2000-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 --
--- Id: llx_compta_account.sql,v 1.4 2007/12/02 22:03:23 eldy Exp 
--- $Source$
---
 -- 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
 -- the Free Software Foundation; either version 2 of the License, or
@@ -22,7 +19,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_compta_account.sql,v 1.4 2007/12/02 22:03:23 eldy Exp 
+-- Id: llx_compta_account.sql,v 1.5 2007/12/16 20:40:40 eldy Exp 
 -- ===================================================================
 
 

pgsql/tables/llx_const.sql

@@ -4,7 +4,8 @@
 
 -- ============================================================================
 -- Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
+-- Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
+-- Copyright (C) 2008      Laurent Destailleur  <eldy@users.sourceforge.net>
 --
 -- 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
@@ -20,14 +21,13 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_const.sql,v 1.8 2007/12/02 22:03:23 eldy Exp 
+-- Id: llx_const.sql,v 1.10 2008/04/20 11:35:36 eldy Exp 
 -- ===========================================================================
 
 --
--- Definitions des constantes utilisés comme parametres de configuration
+-- Table for constants used to store Dolibarr setup
 --
 
-
 create table llx_const
 (
   rowid SERIAL PRIMARY KEY,
@@ -36,6 +36,7 @@ create table llx_const
   "type" varchar(6) CHECK (type IN ('yesno','texte','chaine')) ,
   "visible"     smallint DEFAULT 1 NOT NULL,
   "note"        text,
+  "tms"         timestamp,
   UNIQUE(name)
 );
 

pgsql/tables/llx_deplacement.sql

@@ -19,7 +19,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_deplacement.sql,v 1.4 2007/12/02 22:00:08 eldy Exp 
+-- Id: llx_deplacement.sql,v 1.5 2008/05/26 00:03:52 eldy Exp 
 -- ============================================================================
 
 create table llx_deplacement
@@ -30,7 +30,7 @@ create table llx_deplacement
   "dated"           timestamp,
   "fk_user"	        integer NOT NULL,
   "fk_user_author"  integer,
-  "type"            smallint NOT NULL,
+  "type"            varchar(12) NOT NULL,
   "km"              smallint,
   "fk_soc"          integer,
   "note"            text

pgsql/tables/llx_ecm_directories.sql

@@ -0,0 +1,38 @@
+-- Generated by dolibarr_mysql2pgsql
+-- (c) 2004, PostgreSQL Inc.
+-- (c) 2005, Laurent Destailleur.
+
+-- ===================================================================
+-- Copyright (C) 2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- 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
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- Id: llx_ecm_directories.sql,v 1.2 2008/04/29 23:49:00 eldy Exp 
+-- ===================================================================
+
+-- drop table llx_ecm_directories;
+
+create table llx_ecm_directories
+(
+  rowid SERIAL PRIMARY KEY,
+  "label"           varchar(32) NOT NULL,
+  "fk_parent"       integer,
+  "description"     varchar(255) NOT NULL,
+  "cachenbofdoc"    integer NOT NULL DEFAULT 0,
+  "date_c"		  timestamp,
+  "date_m"		  timestamp,
+  "fk_user_c"		  integer,
+  "fk_user_m"		  integer
+);

pgsql/tables/llx_ecm_documents.sql

@@ -0,0 +1,45 @@
+-- Generated by dolibarr_mysql2pgsql
+-- (c) 2004, PostgreSQL Inc.
+-- (c) 2005, Laurent Destailleur.
+
+-- ===================================================================
+-- Copyright (C) 2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- 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
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- Id: llx_ecm_documents.sql,v 1.1 2008/02/24 23:29:34 eldy Exp 
+-- ===================================================================
+
+-- drop table llx_ecm_document;
+
+create table llx_ecm_document
+(
+  rowid SERIAL PRIMARY KEY,
+  "ref"             varchar(16)  NOT NULL,
+  "filename"        varchar(255) NOT NULL,
+  "filesize"        integer      NOT NULL,
+  "filemime"        varchar(32)  NOT NULL,
+  "fullpath_dol"    varchar(255) NOT NULL,
+  "fullpath_orig"   varchar(255) NOT NULL,
+  "description"     text,
+  "manualkeyword"   text,
+  "fk_create"       integer  NOT NULL,
+  "fk_update"       integer,
+  "date_c"	      timestamp,
+  "date_u"		  timestamp,
+  "fk_directory"    integer,
+  "fk_status"		  smallint DEFAULT 0,
+  "private"         smallint DEFAULT 0
+);

pgsql/tables/llx_element_element.key.sql

@@ -0,0 +1,33 @@
+-- Generated by dolibarr_mysql2pgsql
+-- (c) 2004, PostgreSQL Inc.
+-- (c) 2005, Laurent Destailleur.
+
+-- ============================================================================
+-- Copyright (C) 2008 Laurent Destailleur <eldy@users.sourceforge.net>
+--
+-- 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
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- Id: llx_element_element.key.sql,v 1.1 2008/02/11 14:38:46 eldy Exp 
+-- ============================================================================
+
+
+ALTER TABLE llx_element_element 
+	ADD UNIQUE INDEX idx_element_element_idx1 (sourceid, sourcetype, targetid, targettype);
+
+	
+ALTER TABLE llx_element_element ADD INDEX idx_element_element_targetid (targetid);
+
+-- Pas de contraite sur sourceid et targetid car pointe sur differentes tables
+	

pgsql/tables/llx_element_element.sql

@@ -0,0 +1,36 @@
+-- Generated by dolibarr_mysql2pgsql
+-- (c) 2004, PostgreSQL Inc.
+-- (c) 2005, Laurent Destailleur.
+
+-- ============================================================================
+-- Copyright (C) 2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- 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
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- Id: llx_element_element.sql,v 1.2 2008/06/05 16:43:20 eldy Exp 
+-- ============================================================================
+-- Table used for relations between elements of different types:
+-- invoice-propal, propal-order, etc...
+-- ============================================================================
+
+create table llx_element_element
+(
+  rowid SERIAL PRIMARY KEY,  
+  "sourceid"			integer NOT NULL,
+  "sourcetype"		varchar(16) NOT NULL,
+  "targetid"			integer NOT NULL,
+  "targettype"		varchar(16) NOT NULL
+);
+

pgsql/tables/llx_events.key.sql

@@ -2,8 +2,8 @@
 -- (c) 2004, PostgreSQL Inc.
 -- (c) 2005, Laurent Destailleur.
 
--- ===================================================================
+-- ============================================================================
--- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2008 Laurent Destailleur  <eldy@users.sourceforge.net>
 --
 -- 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
@@ -19,12 +19,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: llx_facture_tva_sum.sql,v 1.6 2007/12/02 21:37:39 eldy Exp 
+-- Id: llx_events.key.sql,v 1.1 2008/02/11 15:01:16 eldy Exp 
--- ===================================================================
+-- ===========================================================================
 
-create table llx_facture_tva_sum
+
-(
+ALTER TABLE llx_events ADD INDEX idx_events_dateevent (dateevent);
-  "fk_facture"    integer NOT NULL,
-  "amount"        real  NOT NULL,
-  "tva_tx"        real  NOT NULL
-);

pgsql/tables/llx_events.sql

@@ -0,0 +1,43 @@
+-- Generated by dolibarr_mysql2pgsql
+-- (c) 2004, PostgreSQL Inc.
+-- (c) 2005, Laurent Destailleur.
+
+-- ========================================================================
+-- Copyright (C) 2008      Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- 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
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- Id: llx_events.sql,v 1.5 2008/04/09 21:38:40 eldy Exp 
+-- ========================================================================
+-- This table logs all dolibarr security events
+-- Content of this table is not managed by users but by Dolibarr
+-- trigger interface_all_LogEvent.
+-- ========================================================================
+
+create table llx_events
+(
+  rowid SERIAL PRIMARY KEY,
+  "tms"            timestamp,             -- date creation/modification
+  "type"			 varchar(32)  NOT NULL, -- action type
+  "dateevent"      timestamp,              -- date event
+  "fk_user"        integer,               -- id user
+  "description"    varchar(250) NOT NULL, -- full description of action
+  "ip"			 varchar(32) NOT NULL,  -- ip
+  "fk_object"      integer                -- id of related object
+);
+
+
+
+

pgsql/tables/llx_expedition.key.sql

@@ -0,0 +1,39 @@
+-- Generated by dolibarr_mysql2pgsql
+-- (c) 2004, PostgreSQL Inc.
+-- (c) 2005, Laurent Destailleur.
+
+-- ===================================================================
+-- Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2008 Regis Houssin        <regis@dolibarr.fr>
+--
+-- 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
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- Id: llx_expedition.key.sql,v 1.2 2008/01/21 19:17:56 hregis Exp 
+-- ===================================================================
+
+
+ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_soc (fk_soc);
+ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_user_author (fk_user_author);
+ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_user_valid (fk_user_valid);
+ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_adresse_livraison (fk_adresse_livraison);
+ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_expedition_methode (fk_expedition_methode);
+
+ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_soc                FOREIGN KEY (fk_soc)                 REFERENCES llx_societe (rowid);
+ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_user_author        FOREIGN KEY (fk_user_author)         REFERENCES llx_user (rowid);
+ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_user_valid         FOREIGN KEY (fk_user_valid)          REFERENCES llx_user (rowid);
+ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_adresse_livraison  FOREIGN KEY (fk_adresse_livraison)   REFERENCES llx_societe_adresse_livraison (rowid);
+ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_expedition_methode FOREIGN KEY (fk_expedition_methode)  REFERENCES llx_expedition_methode (rowid);
+
+ALTER TABLE llx_expedition ADD UNIQUE INDEX idx_expedition_uk_ref (ref);

pgsql/tables/llx_expedition.sql

@@ -4,6 +4,7 @@
 
 -- ===================================================================
 -- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2008 Regis Houssin        <regis@dolibarr.fr>
 --
 -- 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
@@ -19,29 +20,23 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_expedition.sql,v 1.4 2007/12/02 21:58:49 eldy Exp 
+-- Id: llx_expedition.sql,v 1.6 2008/01/21 19:17:56 hregis Exp 
 -- ===================================================================
 
-
 create table llx_expedition
 (
   rowid SERIAL PRIMARY KEY,
   "tms"                   timestamp,
   "ref"                   varchar(30) NOT NULL,
-  "fk_commande"           integer,
+  "fk_soc"                integer     NOT NULL,
-  "date_creation"         timestamp,              -- date de creation 
+  "date_creation"         timestamp,                -- date de creation
-  "date_valid"            timestamp,              -- date de validation
+  "fk_user_author"        integer,                 -- createur
-  "date_expedition"       date,                  -- date de l'expedition
+  "date_valid"            timestamp,                -- date de validation
-  "fk_user_author"        integer,               -- createur
+  "fk_user_valid"         integer,                 -- valideur
-  "fk_user_valid"         integer,               -- valideur
+  "date_expedition"       date,                    -- date de l'expedition
-  "fk_entrepot"           integer,
+  "fk_adresse_livraison"  integer   DEFAULT NULL,  -- adresse de livraison
   "fk_expedition_methode" integer,
   "fk_statut"             smallint  DEFAULT 0,
   "note"                  text,
-  "model_pdf"             varchar(50),
+  "model_pdf"             varchar(50)
-  UNIQUE(ref)
 );
-
-CREATE INDEX idx_llx_expedition_ref ON llx_expedition (ref);
-CREATE INDEX idx_llx_expedition_fk_expedition_methode ON llx_expedition (fk_expedition_methode);
-CREATE INDEX idx_llx_expedition_fk_commande ON llx_expedition (fk_commande);

pgsql/tables/llx_expeditiondet.key.sql

@@ -1,29 +1,28 @@
+-- Generated by dolibarr_mysql2pgsql
+-- (c) 2004, PostgreSQL Inc.
+-- (c) 2005, Laurent Destailleur.
+
 -- ===================================================================
 -- Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2008 Regis Houssin        <regis@dolibarr.fr>
 --
 -- 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
+-- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation; either version 2 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General [public] License for more details.
+-- GNU General Public License for more details.
 --
--- You should have received a copy of the GNU General [public] License
+-- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- $Id$
+-- Id: llx_expeditiondet.key.sql,v 1.1 2008/01/17 10:28:28 hregis Exp 
--- $Source$
 -- ===================================================================
 
 
--- Supprimme orhpelins pour permettre montée de la clé
+ALTER TABLE llx_expeditiondet ADD INDEX idx_expeditiondet_fk_expedition (fk_expedition);
--- V4 DELETE llx_facture_tva_sum FROM llx_facture_tva_sum LEFT JOIN llx_facture ON llx_facture_tva_sum.fk_facture = llx_facture.rowid WHERE llx_facture.rowid IS NULL;
+ALTER TABLE llx_expeditiondet ADD CONSTRAINT fk_expeditiondet_fk_expedition FOREIGN KEY (fk_expedition) REFERENCES llx_expedition (rowid);
-
-
-CREATE INDEX idx_facture_tva_sum_fk_facture ON llx_facture_tva_sum(fk_facture);
-
-ALTER TABLE llx_facture_tva_sum ADD CONSTRAINT fk_facture_tva_sum_fk_facture FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid);

pgsql/tables/llx_expeditiondet.sql

@@ -4,6 +4,7 @@
 
 -- ===================================================================
 -- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2008 Regis Houssin        <regis@dolibarr.fr>
 --
 -- 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
@@ -19,17 +20,15 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_expeditiondet.sql,v 1.4 2007/12/02 21:58:49 eldy Exp 
+-- Id: llx_expeditiondet.sql,v 1.5 2008/01/17 10:28:28 hregis Exp 
 -- ===================================================================
 
-
 create table llx_expeditiondet
 (
   rowid SERIAL PRIMARY KEY,
   "fk_expedition"     integer NOT NULL,
-  "fk_commande_ligne" integer NOT NULL,
+  "fk_origin_line"    integer,           -- Correspondance de la ligne avec le document d'origine (propal, commande)
-  "qty"               real              -- quantité
+  "fk_entrepot"       integer,           -- Entrepot de depart du produit
+  "qty"               real,              -- Quantity
+  "rang"              integer  DEFAULT 0
 );
-
-CREATE INDEX idx_llx_expeditiondet_fk_expedition ON llx_expeditiondet (fk_expedition);
-CREATE INDEX idx_llx_expeditiondet_fk_commande_ligne ON llx_expeditiondet (fk_commande_ligne);

pgsql/tables/llx_facture_fourn_det.sql

@@ -19,10 +19,9 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_facture_fourn_det.sql,v 1.8 2007/12/02 21:37:38 eldy Exp 
+-- Id: llx_facture_fourn_det.sql,v 1.9 2008/02/17 22:49:20 eldy Exp 
 -- ===================================================================
 
-
 create table llx_facture_fourn_det
 (
   rowid SERIAL PRIMARY KEY,
@@ -35,5 +34,6 @@ create table llx_facture_fourn_det
   "tva_taux"          real(24,8) DEFAULT 0,
   "total_ht"          real(24,8) DEFAULT 0,
   "tva"               real(24,8) DEFAULT 0,
-  "total_ttc"         real(24,8) DEFAULT 0
+  "total_ttc"         real(24,8) DEFAULT 0,
+  "product_type"		integer      DEFAULT 0
 );

pgsql/tables/llx_facturedet.sql

@@ -20,7 +20,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_facturedet.sql,v 1.24 2007/12/02 21:37:39 eldy Exp 
+-- Id: llx_facturedet.sql,v 1.25 2008/02/17 22:49:20 eldy Exp 
 -- ===================================================================
 
 
@@ -40,6 +40,7 @@ create table llx_facturedet
   "total_ht"            real,	             	           -- Total HT de la ligne toute quantité et incluant remise ligne et globale
   "total_tva"           real,	             	           -- Total TVA de la ligne toute quantité et incluant remise ligne et globale
   "total_ttc"           real,	             	           -- Total TTC de la ligne toute quantité et incluant remise ligne et globale
+  "product_type"		  integer      DEFAULT 0,
   "date_start"          timestamp,          	           -- date debut si service
   "date_end"            timestamp,                      -- date fin si service
   "info_bits"		        integer    DEFAULT 0, 	       -- TVA NPR ou non

pgsql/tables/llx_livraison.key.sql

@@ -0,0 +1,37 @@
+-- Generated by dolibarr_mysql2pgsql
+-- (c) 2004, PostgreSQL Inc.
+-- (c) 2005, Laurent Destailleur.
+
+-- ===================================================================
+-- Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2008 Regis Houssin        <regis@dolibarr.fr>
+--
+-- 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
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- Id: llx_livraison.key.sql,v 1.3 2008/01/21 19:20:24 hregis Exp 
+-- ===================================================================
+
+
+ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_soc (fk_soc);
+ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_user_author (fk_user_author);
+ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_user_valid (fk_user_valid);
+ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_adresse_livraison (fk_adresse_livraison);
+
+ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_soc                FOREIGN KEY (fk_soc)                 REFERENCES llx_societe (rowid);
+ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_user_author        FOREIGN KEY (fk_user_author)         REFERENCES llx_user (rowid);
+ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_user_valid         FOREIGN KEY (fk_user_valid)          REFERENCES llx_user (rowid);
+ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_adresse_livraison  FOREIGN KEY (fk_adresse_livraison)   REFERENCES llx_societe_adresse_livraison (rowid);
+
+ALTER TABLE llx_livraison ADD UNIQUE INDEX idx_livraison_uk_ref (ref);

pgsql/tables/llx_livraison.sql

@@ -4,6 +4,7 @@
 
 -- ===================================================================
 -- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2008 Regis Houssin        <regis@dolibarr.fr>
 --
 -- 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
@@ -19,31 +20,26 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_livraison.sql,v 1.6 2007/12/02 21:37:40 eldy Exp 
+-- Id: llx_livraison.sql,v 1.8 2008/01/21 19:17:56 hregis Exp 
 -- ===================================================================
 
-
 create table llx_livraison
 (
   rowid SERIAL PRIMARY KEY,
   "tms"                   timestamp,
-  "fk_commande"           integer DEFAULT 0,             -- commande auquel est rattache le bon de livraison
+  "ref"                   varchar(30)  NOT NULL,         -- delivery number
+  "ref_client"            varchar(30),                   -- customer number
+  "fk_soc"                integer      NOT NULL,
   "fk_expedition"         integer,                       -- expedition auquel est rattache le bon de livraison
-  "ref"                   varchar(30) NOT NULL,          -- delivery number
   "date_creation"         timestamp,                      -- date de creation
-  "date_valid"            timestamp,                      -- date de validation
   "fk_user_author"        integer,                       -- createur du bon de livraison
+  "date_valid"            timestamp,                      -- date de validation
   "fk_user_valid"         integer,                       -- valideur du bon de livraison
-  "fk_statut"             smallint  default 0,
+  "date_livraison" 	      date 	       default NULL,     -- date de livraison
-  "total_ht"              real      default 0,
+  "fk_adresse_livraison"  integer,                       -- adresse de livraison
-  "total_ttc"             real      default 0,
+  "fk_statut"             smallint     default 0,
+  "total_ht"              real(24,8) default 0,
   "note"                  text,
   "note_public"           text,
-  "model_pdf"             varchar(50),
+  "model_pdf"             varchar(50)
-  "date_livraison" 	      date 	  default NULL,
-  "fk_adresse_livraison"  integer,                       -- adresse de livraison
-  UNIQUE(ref)
 );
-
-CREATE INDEX idx_llx_livraison_ref ON llx_livraison (ref);
-CREATE INDEX idx_llx_livraison_fk_commande ON llx_livraison (fk_commande);

pgsql/tables/llx_livraisondet.key.sql

@@ -4,6 +4,7 @@
 
 -- ===================================================================
 -- Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2008 Regis Houssin        <regis@dolibarr.fr>
 --
 -- 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
@@ -19,13 +20,9 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_facture_tva_sum.key.sql,v 1.6 2007/12/02 21:37:39 eldy Exp 
+-- Id: llx_livraisondet.key.sql,v 1.1 2008/01/21 19:20:24 hregis Exp 
 -- ===================================================================
 
 
--- Supprimme orhpelins pour permettre montée de la clé
+ALTER TABLE llx_livraisondet ADD INDEX idx_livraisondet_fk_expedition (fk_livraison);
--- V4 DELETE llx_facture_tva_sum FROM llx_facture_tva_sum LEFT JOIN llx_facture ON llx_facture_tva_sum.fk_facture = llx_facture.rowid WHERE llx_facture.rowid IS NULL;
+ALTER TABLE llx_livraisondet ADD CONSTRAINT fk_livraisondet_fk_livraison FOREIGN KEY (fk_livraison) REFERENCES llx_livraison (rowid);
-
-
-ALTER TABLE llx_facture_tva_sum ADD INDEX idx_facture_tva_sum_fk_facture (fk_facture);
-ALTER TABLE llx_facture_tva_sum ADD CONSTRAINT fk_facture_tva_sum_fk_facture FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid);

pgsql/tables/llx_livraisondet.sql

@@ -4,6 +4,7 @@
 
 -- ===================================================================
 -- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2008 Regis Houssin        <regis@dolibarr.fr>
 --
 -- 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
@@ -19,16 +20,18 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_livraisondet.sql,v 1.3 2007/12/02 21:37:40 eldy Exp 
+-- Id: llx_livraisondet.sql,v 1.6 2008/01/31 12:16:25 hregis Exp 
 -- ===================================================================
 
 create table llx_livraisondet
 (
   rowid SERIAL PRIMARY KEY,
   "fk_livraison"      integer,
-  "fk_commande_ligne" integer NOT NULL,
+  "fk_origin_line"    integer,                         -- Correspondance de la ligne avec le document d'origine (propal, commande)
-  "qty"               real              -- quantité
+  "fk_product"        integer,
+  "description"       text,
+  "qty"               real,                            -- quantité
+  "subprice"          real(24,8) DEFAULT 0,          -- prix unitaire
+  "total_ht"          real(24,8) DEFAULT 0,          -- Total HT de la ligne toute quantité
+  "rang"              integer      DEFAULT 0
 );
-
-CREATE INDEX idx_llx_livraisondet_fk_livraison ON llx_livraisondet (fk_livraison);
-CREATE INDEX idx_llx_livraisondet_fk_commande_ligne ON llx_livraisondet (fk_commande_ligne);

pgsql/tables/llx_menu.key.sql

@@ -1,32 +1,30 @@
+-- Generated by dolibarr_mysql2pgsql
+-- (c) 2004, PostgreSQL Inc.
+-- (c) 2005, Laurent Destailleur.
+
 -- ========================================================================
--- Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2007      Patrick Raguin <patrick.raguin@gmail.com>
+-- Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
 --
 -- 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
+-- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation; either version 2 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General [public] License for more details.
+-- GNU General Public License for more details.
 --
--- You should have received a copy of the GNU General [public] License
+-- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- $Id$
+-- Id: llx_menu.key.sql,v 1.1 2008/01/14 20:54:17 eldy Exp 
--- $Source$
---
 -- ========================================================================
 
-create table llx_societe_perms
-(
-  fk_soc    integer,
-  fk_user   integer,
-  pread     tinyint DEFAULT 0, -- permission de lecture
-  pwrite    tinyint DEFAULT 0, -- permission d'ecriture
-  pperms    tinyint DEFAULT 0, -- permission sur les permissions
-);
 
-CREATE UNIQUE INDEX fk_soc_fk_user ON llx_societe_perms(fk_soc, fk_user)
+ALTER TABLE llx_menu ADD INDEX idx_menu_menuhandler_type (menu_handler, type);
+
+ALTER TABLE llx_menu ADD UNIQUE INDEX idx_menu_uk_menu (menu_handler, fk_menu, url);
+

pgsql/tables/llx_menu.sql

@@ -3,8 +3,8 @@
 -- (c) 2005, Laurent Destailleur.
 
 -- ========================================================================
--- Copyright (C) 2007 Patrick Raguin      <patrick.raguin@gmail.com>
+-- Copyright (C) 2007      Patrick Raguin      <patrick.raguin@gmail.com>
--- Copyright (C) 2007 Laurent Destailleur <eldy@users.sourceforge.net>
+-- Copyright (C) 2007-2008 Laurent Destailleur <eldy@users.sourceforge.net>
 --
 -- 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
@@ -25,25 +25,27 @@
 
 
 CREATE TABLE `llx_menu` (
-  `rowid` int(11) NOT NULL,
+	rowid			integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
 
-  `menu_handler` varchar(16) NOT NULL default 'auguria',	-- Menu handler name
+	menu_handler	varchar(16) NOT NULL,				-- Menu handler name
-  `type` enum('top','left') NOT NULL default 'left',		-- Menu top or left
+	module			varchar(64),						-- Module name if record is added by a module
+	type			enum('top','left') NOT NULL,		-- Menu top or left
 
-  `mainmenu` varchar(100) NOT NULL,				-- Name family/module (home, companies, ...)
+	mainmenu		varchar(100) NOT NULL,				-- Name family/module (home, companies, ...)
-  `fk_menu` int(11) NOT NULL,					-- 0 or Id of mother menu line
+	fk_menu			int(11) NOT NULL,					-- 0 or Id of mother menu line
-  `order` tinyint(4) NOT NULL,					-- Order of entry
+	position		integer NOT NULL,				-- Sort order of entry
 
-  `url` varchar(255) NOT NULL,					-- Relative (or absolute) url to go
+	url				varchar(255) NOT NULL,				-- Relative (or absolute) url to go
-  `target` varchar(100) NULL,					-- Target of Url link
+	target			varchar(100) NULL,					-- Target of Url link
 
-  `titre` varchar(255) NOT NULL,				-- Key for menu translation 
+	titre			varchar(255) NOT NULL,				-- Key for menu translation 
-  `langs` varchar(100),							-- Lang file to load for translation
+	langs			varchar(100),						-- Lang file to load for translation
 
-  `level` tinyint(1),							-- ???
+	level			tinyint(1),							-- Used by auguria menu only. Do not use.
 
-  `leftmenu` varchar(100) NULL,					-- Condition to show or hide
+	leftmenu		varchar(1) NULL default '1',		-- Say if left menu defined in pre.inc.php and used by top menu must be overwritten by dynamic databse menu (1=yes by default)
-  `right` varchar(255),							-- Condition to show enabled or disabled
+	perms			varchar(255),						-- Condition to show enabled or disabled
-  `user` tinyint(4) NOT NULL default '0',		-- 0 if menu for all users, 1 for external only, 2 for internal only
+	user			integer NOT NULL default '0',	    -- 0 if menu for all users, 1 for external only, 2 for internal only
-  PRIMARY KEY  (`rowid`)
+
+	tms				timestamp
 ) type=innodb;

pgsql/tables/llx_menu_const.key.sql

@@ -24,8 +24,10 @@
 -- ========================================================================
 
 
-ALTER TABLE `llx_menu_const` ADD INDEX `idx_menu_const_fk_menu` (`fk_menu`);
+ALTER TABLE llx_menu_const ADD INDEX `idx_menu_const_fk_menu` (`fk_menu`);
-ALTER TABLE `llx_menu_const` ADD INDEX `idx_menu_const_fk_constraint` (`fk_constraint`);
+ALTER TABLE llx_menu_const ADD INDEX `idx_menu_const_fk_constraint` (`fk_constraint`);
 
-ALTER TABLE `llx_menu_const` ADD CONSTRAINT `fk_menu_const_fk_menu` FOREIGN KEY (`fk_menu`) REFERENCES `llx_menu` (`rowid`);
+ALTER TABLE llx_menu_const ADD CONSTRAINT `fk_menu_const_fk_menu` FOREIGN KEY (`fk_menu`) REFERENCES `llx_menu` (`rowid`);
-ALTER TABLE `llx_menu_const` ADD CONSTRAINT `fk_menu_const_fk_constraint` FOREIGN KEY (`fk_constraint`) REFERENCES `llx_menu_constraint` (`rowid`);
+ALTER TABLE llx_menu_const ADD CONSTRAINT `fk_menu_const_fk_constraint` FOREIGN KEY (`fk_constraint`) REFERENCES `llx_menu_constraint` (`rowid`);
+
+ALTER TABLE llx_menu_const ADD UNIQUE KEY uk_menu_const(fk_menu, fk_constraint);

pgsql/tables/llx_menu_const.sql

@@ -27,9 +27,6 @@ CREATE TABLE `llx_menu_const` (
   `rowid` int(11) NOT NULL auto_increment,
   `fk_menu` int(11) NOT NULL,
   `fk_constraint` int(11) NOT NULL,
-  `user` tinyint(4) NOT NULL default '2',
+  PRIMARY KEY  (`rowid`)
-  PRIMARY KEY  (`rowid`),
-  KEY `fk_menu` (`fk_menu`),
-  KEY `fk_constraint` (`fk_constraint`)
 ) type=innodb;
 

pgsql/tables/llx_paiement.sql

@@ -20,7 +20,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_paiement.sql,v 1.15 2007/12/07 21:27:26 hregis Exp 
+-- Id: llx_paiement.sql,v 1.16 2008/01/27 00:16:02 eldy Exp 
 -- ===================================================================
 
 
@@ -39,7 +39,7 @@ create table llx_paiement
   "fk_paiement"      integer NOT NULL,
   "num_paiement"     varchar(50),
   "note"             text,
-  "fk_bank"          integer NOT NULL,
+  "fk_bank"          integer NOT NULL DEFAULT 0,
   "fk_user_creat"    integer,            -- utilisateur qui a créé l'info
   "fk_user_modif"    integer,            -- utilisateur qui a modifié l'info
   "statut"           smallint DEFAULT 0 NOT NULL,

pgsql/tables/llx_pr_exp.sql

@@ -0,0 +1,35 @@
+-- Generated by dolibarr_mysql2pgsql
+-- (c) 2004, PostgreSQL Inc.
+-- (c) 2005, Laurent Destailleur.
+
+-- ===================================================================
+-- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2008 Regis Houssin        <regis@dolibarr.fr>
+--
+-- 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
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- Id: llx_pr_exp.sql,v 1.1 2008/01/31 13:40:49 hregis Exp 
+-- ===================================================================
+
+
+create table llx_pr_exp
+(
+  rowid SERIAL PRIMARY KEY,
+  "fk_propal"     integer NOT NULL,
+  "fk_expedition" integer NOT NULL
+);
+
+CREATE INDEX idx_llx_pr_exp_fk_propal ON llx_pr_exp (fk_propal);
+CREATE INDEX idx_llx_pr_exp_fk_expedition ON llx_pr_exp (fk_expedition);

pgsql/tables/llx_pr_liv.sql

@@ -1,27 +1,35 @@
+-- Generated by dolibarr_mysql2pgsql
+-- (c) 2004, PostgreSQL Inc.
+-- (c) 2005, Laurent Destailleur.
+
 -- ===================================================================
 -- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2008 Regis Houssin        <regis@dolibarr.fr>
 --
 -- 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
+-- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation; either version 2 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General [public] License for more details.
+-- GNU General Public License for more details.
 --
--- You should have received a copy of the GNU General [public] License
+-- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- $Id$
+-- Id: llx_pr_liv.sql,v 1.1 2008/01/31 13:40:50 hregis Exp 
--- $Source$
 -- ===================================================================
 
-create table llx_facture_tva_sum
+
+create table llx_pr_liv
 (
-  fk_facture    integer NOT NULL,
+  rowid SERIAL PRIMARY KEY,
-  amount        real  NOT NULL,
+  "fk_propal"     integer NOT NULL,
-  tva_tx        real  NOT NULL
+  "fk_livraison"  integer NOT NULL
 );
+
+CREATE INDEX idx_llx_pr_liv_fk_propal ON llx_pr_liv (fk_propal);
+CREATE INDEX idx_llx_pr_liv_fk_livraison ON llx_pr_liv (fk_livraison);

pgsql/tables/llx_projet.sql

@@ -19,7 +19,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_projet.sql,v 1.5 2007/12/02 21:37:45 eldy Exp 
+-- Id: llx_projet.sql,v 1.6 2008/03/02 22:20:47 eldy Exp 
 -- ===========================================================================
 
 
@@ -27,7 +27,7 @@
 create table llx_projet
 (
   rowid SERIAL PRIMARY KEY,
-  "fk_soc"           integer  NOT NULL,
+  "fk_soc"           integer,
   "fk_statut"        smallint NOT NULL,
   "tms"              timestamp,
   "dateo"            date,         -- date d'ouverture du projet

pgsql/tables/llx_propaldet.sql

@@ -19,7 +19,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_propaldet.sql,v 1.19 2007/12/12 16:36:00 hregis Exp 
+-- Id: llx_propaldet.sql,v 1.20 2008/01/09 09:48:23 hregis Exp 
 -- ===================================================================
 
 create table llx_propaldet
@@ -51,5 +51,5 @@ create table llx_propaldet
 --
 -- 1 : frais de port
 -- 2 : ecotaxe
--- 3 : option
+-- 3 : produit/service propose en option
 --

pgsql/tables/llx_societe.key.sql

@@ -19,7 +19,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_societe.key.sql,v 1.5 2007/12/02 21:37:46 eldy Exp 
+-- Id: llx_societe.key.sql,v 1.6 2008/03/01 01:13:17 eldy Exp 
 -- ===================================================================
 
 
@@ -28,3 +28,5 @@ ALTER TABLE llx_societe ADD UNIQUE uk_societe_code_client(code_client);
 
 ALTER TABLE llx_societe ADD INDEX idx_societe_user_creat(fk_user_creat);
 ALTER TABLE llx_societe ADD INDEX idx_societe_user_modif(fk_user_modif);
+
+--ALTER TABLE llx_societe ADD FOREIGN KEY fk_prospectlevel llx_c_prospectlevel(code);

pgsql/tables/llx_societe.sql

@@ -19,7 +19,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_societe.sql,v 1.31 2007/12/02 21:37:46 eldy Exp 
+-- Id: llx_societe.sql,v 1.32 2008/03/01 01:13:17 eldy Exp 
 -- ========================================================================
 
 create table llx_societe
@@ -55,13 +55,14 @@ create table llx_societe
   "tva_intra"          varchar(20),                         -- tva
   "capital"            real,                                -- capital de la société
   "description"        text,                                --
-  "fk_stcomm"          smallint        DEFAULT 0,            -- commercial statut
+  "fk_stcomm"          smallint       DEFAULT 0,            -- commercial statut
   "note"               text,                                --
   "services"           smallint        DEFAULT 0,            --
   "prefix_comm"        varchar(5),                          -- prefix commercial
   "client"             smallint        DEFAULT 0,            -- client 0/1/2
   "fournisseur"        smallint        DEFAULT 0,            -- fournisseur 0/1
   "supplier_account"   varchar(32),                         -- compte client chez un fournisseur
+  "fk_prospectlevel"   varchar(12),                         -- prospect level (in llx_c_prospectlevel)
   "customer_bad"       smallint        DEFAULT 0,            -- mauvais payeur 0/1
   "customer_rate"      real           DEFAULT 0,            -- taux fiabilié client (0 à 1)
   "supplier_rate"      real           DEFAULT 0,            -- taux fiabilié fournisseur (0 à 1)

pgsql/tables/llx_societe_adresse_livraison.sql

@@ -20,7 +20,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_societe_adresse_livraison.sql,v 1.7 2007/12/02 21:37:46 eldy Exp 
+-- Id: llx_societe_adresse_livraison.sql,v 1.8 2007/12/27 19:02:28 hregis Exp 
 -- ========================================================================
 
 create table llx_societe_adresse_livraison
@@ -35,6 +35,8 @@ create table llx_societe_adresse_livraison
   "cp"                 varchar(10),                         -- zipcode
   "ville"              varchar(50),                         -- town
   "fk_pays"            integer        DEFAULT 0,            --
+  "tel"                varchar(20),                         -- phone number
+  "fax"                varchar(20),                         -- fax number
   "note"               text,                                --
   "fk_user_creat"      integer,                             -- utilisateur qui a créé l'info
   "fk_user_modif"      integer                              -- utilisateur qui a modifié l'info

pgsql/tables/llx_societe_log.sql

@@ -4,10 +4,7 @@
 
 -- ========================================================================
 -- Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2007       Laurent Destailleur <eldy@users.sourceforge.net>
+-- Copyright (C) 2007      Laurent Destailleur  <eldy@users.sourceforge.net>
---
--- Id: llx_societe_log.sql,v 1.2 2007/12/02 21:37:46 eldy Exp 
--- $Source: /cvsroot/dolibarr/dolibarr/mysql/tables/llx_societe_log.sql,v $
 --
 -- 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
@@ -23,7 +20,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_societe_log.sql,v 1.2 2007/12/02 21:37:46 eldy Exp 
+-- Id: llx_societe_log.sql,v 1.3 2007/12/16 20:41:15 eldy Exp 
 -- ========================================================================
 
 create table llx_societe_log

pgsql/tables/llx_socpeople.sql

@@ -4,6 +4,7 @@
 
 -- ============================================================================
 -- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2008      Laurent Destailleur  <eldy@users.sourceforge.net>
 --
 -- 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
@@ -19,7 +20,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_socpeople.sql,v 1.18 2007/12/02 21:37:47 eldy Exp 
+-- Id: llx_socpeople.sql,v 1.19 2008/03/30 22:25:42 eldy Exp 
 -- ============================================================================
 
 create table llx_socpeople
@@ -43,6 +44,7 @@ create table llx_socpeople
   "fax"            varchar(30),
   "email"          varchar(255),
   "jabberid"       varchar(255),
+  "priv"           smallint NOT NULL DEFAULT 0,
   "fk_user_creat"  integer DEFAULT 0, -- user qui a créé l'enregistrement
   "fk_user_modif"  integer,
   "note"           text

pgsql/tables/llx_tva.sql

@@ -19,7 +19,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- Id: llx_tva.sql,v 1.8 2007/12/02 21:37:47 eldy Exp 
+-- Id: llx_tva.sql,v 1.9 2008/04/03 19:35:48 eldy Exp 
 -- ===================================================================
 
 create table llx_tva
@@ -31,7 +31,7 @@ create table llx_tva
   "amount"          real NOT NULL DEFAULT 0,
   "label"           varchar(255),
   "note"            text,
-  "fk_bank"         integer NOT NULL,  
+  "fk_bank"         integer,  
   "fk_user_creat"   integer,            -- utilisateur qui a créé l'info
   "fk_user_modif"   integer             -- utilisateur qui a modifié l'info
 );

pgsql/tables/llx_user_rights.sql

@@ -23,7 +23,17 @@
 -- ===========================================================================
 
 
-create table llx_user_rights
+CREATE TABLE llx_surveys_answers_summary (
+  fk_question       integer PRIMARY KEY,
+  "nb_rep1"           decimal(10,0) NOT NULL default '0',
+  "nb_rep2"           decimal(10,0) default NULL,
+  "nb_rep3"           decimal(10,0) default NULL,
+  "nb_rep4"           decimal(10,0) default NULL,
+  "tot_rep1"          decimal(10,0) NOT NULL default '0',
+  "tot_rep2"          decimal(10,0) default NULL,
+  "tot_rep3"          decimal(10,0) default NULL,
+  "tot_rep4"          decimal(10,0) default NULL
+")""create" table llx_user_rights
 (
   rowid SERIAL PRIMARY KEY,
   "fk_user"       integer NOT NULL,