From 38b3518df50eef4c14e5679fe628dbc015b5a9d7 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 20 Apr 2011 14:50:35 +0000 Subject: [PATCH] Fix: missing fields --- htdocs/install/mysql/migration/3.0.0-3.1.0.sql | 4 ++-- htdocs/install/mysql/tables/llx_commande.sql | 3 ++- htdocs/install/mysql/tables/llx_propal.sql | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql index 62d3233261b..abcd8583410 100755 --- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql +++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql @@ -67,8 +67,8 @@ CREATE TABLE llx_c_source )ENGINE=innodb; ALTER TABLE llx_propal CHANGE COLUMN delivery fk_availability integer NULL; -ALTER TABLE llx_propal ADD COLUMN fk_availability integer NULL AFTER fk_adresse_livraison; -ALTER TABLE llx_commande ADD COLUMN fk_availability integer NULL; +ALTER TABLE llx_propal ADD COLUMN fk_availability integer NULL AFTER date_livraison; +ALTER TABLE llx_commande ADD COLUMN fk_availability integer NULL AFTER date_livraison; INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (1, 'AV_NOW', 'Immediate', 1); INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (2, 'AV_1W', '1 week', 1); diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 3beca357c87..9e021d79abf 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -58,7 +58,8 @@ create table llx_commande facture tinyint default 0, fk_cond_reglement integer, -- condition de reglement fk_mode_reglement integer, -- mode de reglement - date_livraison date default NULL, + date_livraison date default NULL, + fk_availability integer NULL, fk_adresse_livraison integer, -- delivery address (deprecated) import_key varchar(14) )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index 3498686059f..152b3f812cd 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -1,6 +1,6 @@ -- =================================================================== -- Copyright (C) 2001-2003 Rodolphe Quiedeville --- Copyright (C) 2005-2009 Regis Houssin +-- Copyright (C) 2005-2011 Regis Houssin -- Copyright (C) 2010 Laurent Destailleur -- Copyright (C) 2010 Juanjo Menent -- @@ -59,5 +59,6 @@ create table llx_propal note_public text, model_pdf varchar(255), date_livraison date DEFAULT NULL, -- delivery date + fk_availability integer NULL, fk_adresse_livraison integer -- delivery address (deprecated) )ENGINE=innodb;