From 7347ee0479b2be19ec27a92e19c29cd04d36312a Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Sun, 9 Nov 2003 15:27:18 +0000
Subject: [PATCH] =?UTF-8?q?Mise=20=E0=20jour=20des=20formats?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mysql/tables/llx_entrepot.sql        |  2 +-
 mysql/tables/llx_product_stock.sql   |  8 ++++---
 mysql/tables/llx_stock.sql           | 33 ----------------------------
 mysql/tables/llx_stock_mouvement.sql |  4 ++--
 4 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 mysql/tables/llx_stock.sql

diff --git a/mysql/tables/llx_entrepot.sql b/mysql/tables/llx_entrepot.sql
index 205968853e3..49e28979614 100644
--- a/mysql/tables/llx_entrepot.sql
+++ b/mysql/tables/llx_entrepot.sql
@@ -29,5 +29,5 @@ create table llx_entrepot
   description     text,
   fk_user_author  integer
 
-) type=ISAM;
+);
 
diff --git a/mysql/tables/llx_product_stock.sql b/mysql/tables/llx_product_stock.sql
index 83ae03b1a90..f0b5fe98b5b 100644
--- a/mysql/tables/llx_product_stock.sql
+++ b/mysql/tables/llx_product_stock.sql
@@ -25,10 +25,12 @@ create table llx_product_stock
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   tms             timestamp,
   fk_product      integer NOT NULL,
-  fk_stock        integer NOT NULL,
-  value           integer,
+  fk_entrepot     integer NOT NULL,
+  reel            integer,  -- stock réel
+  commande        integer,  -- stock commande
+  proposition     integer,  -- stock proposition commerciale
 
   key(fk_product),
-  key(fk_stock)
+  key(fk_entrepot)
 );
 
diff --git a/mysql/tables/llx_stock.sql b/mysql/tables/llx_stock.sql
deleted file mode 100644
index 747cc81cf59..00000000000
--- a/mysql/tables/llx_stock.sql
+++ /dev/null
@@ -1,33 +0,0 @@
--- ============================================================================
--- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
---
--- 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$
--- $Source$
---
--- ============================================================================
-
-create table llx_entrepot
-(
-  rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  datec           datetime,
-  tms             timestamp,
-  label           varchar(255),
-  description     text,
-  fk_user_author  integer
-
-) type=INNODB;
-
diff --git a/mysql/tables/llx_stock_mouvement.sql b/mysql/tables/llx_stock_mouvement.sql
index 9dd36efbe21..9b89e7e7719 100644
--- a/mysql/tables/llx_stock_mouvement.sql
+++ b/mysql/tables/llx_stock_mouvement.sql
@@ -26,12 +26,12 @@ create table llx_stock_mouvement
   tms             timestamp,
   datem           datetime,
   fk_product      integer NOT NULL,
-  fk_stock        integer NOT NULL,
+  fk_entrepot     integer NOT NULL,
   value           integer,
   type_mouvement  smallint,
   fk_user_author  integer,
 
   key(fk_product),
-  key(fk_stock)
+  key(fk_entrepot)
 );