From 1678481a178e49af2f23f42ca71c27a03b0585eb Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 1 Apr 2011 11:00:02 +0000 Subject: [PATCH] Fix: rename table --- htdocs/comm/propal.php | 2 +- htdocs/core/class/html.form.class.php | 1 + htdocs/install/mysql/migration/3.0.0-3.1.0.sql | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 0cff46ff37b..0d2189d28b1 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1281,7 +1281,7 @@ if ($id > 0 || ! empty($ref)) print ''; if ($_GET['action'] == 'editavailability') { - $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_availability,'availability'); + $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_availability,'fk_availability'); } else { diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 72207253463..53fa0c2f50d 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -47,6 +47,7 @@ class Form // Cache arrays var $cache_types_paiements=array(); var $cache_conditions_paiements=array(); + var $cache_availability=array(); var $tva_taux_value; var $tva_taux_libelle; 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 b6f5a9abdba..6cd9ab70e0f 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 @@ -55,3 +55,7 @@ create table llx_c_availability ALTER TABLE llx_propal ADD COLUMN fk_availability integer DEFAULT 0 AFTER fk_adresse_livraison; ALTER TABLE llx_propal CHANGE COLUMN delivery fk_availability integer DEFAULT 0; ALTER TABLE llx_availability CHANGE COLUMN libelle label varchar(60) NOT NULL; +INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (1, 'DSP', 'Disponible', 1); +INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (2, 'USM', 'Une semaine', 1); +INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (3, 'DSM', 'Deux semaines', 1); +INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (4, 'TSM', 'Trois semaines', 1);