From edb75a44a7c4ef0d458821ad2eb54f2379f9cb26 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 28 Jul 2011 22:22:31 +0000 Subject: [PATCH] Fix: Add missing fields --- htdocs/install/mysql/migration/3.0.0-3.1.0.sql | 8 +++++--- htdocs/install/mysql/tables/llx_commande.sql | 4 ++-- htdocs/install/mysql/tables/llx_commande_fournisseur.sql | 8 ++++++-- 3 files changed, 13 insertions(+), 7 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 aa6381d5967..cdc633ca281 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 @@ -1,5 +1,5 @@ -- --- $Id: 3.0.0-3.1.0.sql,v 1.82 2011/07/28 18:34:46 eldy Exp $ +-- $Id: 3.0.0-3.1.0.sql,v 1.83 2011/07/28 22:22:32 eldy Exp $ -- -- Be carefull to requests order. -- This file must be loaded by calling /install/index.php page @@ -25,8 +25,10 @@ ALTER TABLE llx_c_ziptown MODIFY fk_county integer NULL; ALTER TABLE llx_c_actioncomm ADD COLUMN position integer NOT NULL DEFAULT 0; ALTER TABLE llx_propal ADD COLUMN fk_demand_reason integer NULL DEFAULT 0; -ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_cond_reglement integer NULL DEFAULT 0; -ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_mode_reglement integer NULL DEFAULT 0; +ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_cond_reglement integer NULL DEFAULT 0 after model_pdf; +ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_mode_reglement integer NULL DEFAULT 0 after fk_cond_reglement; +ALTER TABLE llx_commande_fournisseur ADD COLUMN import_key varchar(14); + --ALTER TABLE llx_c_currencies ADD COLUMN symbole varchar(3) NOT NULL default ''; ALTER TABLE llx_commande_fournisseur MODIFY model_pdf varchar(255); diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index e247e2f154d..9c6e2a065f8 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -17,7 +17,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.12 2011/07/17 21:35:12 hregis Exp $ +-- $Id: llx_commande.sql,v 1.13 2011/07/28 22:22:31 eldy Exp $ -- =================================================================== create table llx_commande @@ -61,7 +61,7 @@ create table llx_commande fk_mode_reglement integer, -- mode de reglement date_livraison date default NULL, fk_availability integer NULL, - fk_demand_reason integer, + fk_demand_reason integer, -- should be named fk_input_reason fk_adresse_livraison integer, -- delivery address (deprecated) import_key varchar(14) )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index 4045afce371..3ef51d6ae21 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -17,7 +17,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$ +-- $Id: llx_commande_fournisseur.sql,v 1.7 2011/07/28 22:22:31 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur @@ -54,7 +54,11 @@ create table llx_commande_fournisseur note text, note_public text, model_pdf varchar(255), - fk_methode_commande integer default 0 + + fk_cond_reglement integer, -- condition de reglement + fk_mode_reglement integer, -- mode de reglement + fk_methode_commande integer default 0, -- should be named fk_input_method + import_key varchar(14) )ENGINE=innodb; --