From b0fc136b97ddd3ef139bb2c0b935b3324e700f32 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 16 Dec 2007 19:35:02 +0000
Subject: [PATCH] Fix: Variable FICHEINTER_ADDON_PDF et FICHEINTER_ADDON
n'avait pas tjs la meme syntax (manquait le E)
---
htdocs/fichinter/fiche.php | 2 +-
htdocs/includes/modules/modFicheinter.class.php | 4 ++--
mysql/data/data.sql | 6 +++---
mysql/migration/2.1.0-2.2.0.sql | 15 +++++++++------
4 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index a7f2a4166d3..193da24b407 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -434,7 +434,7 @@ if ($_GET["action"] == 'create')
print '<td colspan="2">';
$model=new ModelePDFFicheinter();
$liste=$model->liste_modeles($db);
- $html->select_array('model',$liste,$conf->global->FICHINTER_ADDON_PDF);
+ $html->select_array('model',$liste,$conf->global->FICHEINTER_ADDON_PDF);
print "</td></tr>";
print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
diff --git a/htdocs/includes/modules/modFicheinter.class.php b/htdocs/includes/modules/modFicheinter.class.php
index 89c3bad72a8..c40859760eb 100644
--- a/htdocs/includes/modules/modFicheinter.class.php
+++ b/htdocs/includes/modules/modFicheinter.class.php
@@ -78,12 +78,12 @@ class modFicheinter extends DolibarrModules
$this->const = array();
$r=0;
- $this->const[$r][0] = "FICHINTER_ADDON_PDF";
+ $this->const[$r][0] = "FICHEINTER_ADDON_PDF";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "soleil";
$r++;
- $this->const[$r][0] = "FICHINTER_ADDON";
+ $this->const[$r][0] = "FICHEINTER_ADDON";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "pacific";
$r++;
diff --git a/mysql/data/data.sql b/mysql/data/data.sql
index 18b38d5cd23..df91b3f8c09 100644
--- a/mysql/data/data.sql
+++ b/mysql/data/data.sql
@@ -134,7 +134,7 @@ insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_
--
-- Mail Mailing
--
-insert into llx_const (name, value, type, note, visible) values ('MAILING_EMAIL_FROM','dolibarr@domain.com','chaine','EMail emmetteur pour les envois d\'emailings',0);
+insert into llx_const (name, value, type, note, visible) values ('MAILING_EMAIL_FROM','dolibarr@domain.com','chaine','EMail emmetteur pour les envois d emailings',0);
--
-- Mailman
@@ -144,7 +144,7 @@ insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAILM
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAILMAN_URL','http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%','chaine','Url pour les inscriptions mailman',0);
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAILMAN_LISTS','test-test,test-test2','chaine','Listes auxquelles inscrire les nouveaux adherents',0);
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAILMAN_ADMINPW','','chaine','Mot de passe Admin des liste mailman',0);
-insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAILMAN_SERVER','lists.domain.com','chaine','Serveur hebergeant les interfaces d\'Admin des listes mailman',0);
+insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAILMAN_SERVER','lists.domain.com','chaine','Serveur hebergeant les interfaces d Admin des listes mailman',0);
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAILMAN_LISTS_COTISANT','','chaine','Liste(s) auxquelles les nouveaux cotisants sont inscris automatiquement',0);
--
-- Glasnost
@@ -152,7 +152,7 @@ insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAILM
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_USE_GLASNOST','0','yesno','utilisation de glasnost ?',0);
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_GLASNOST_SERVEUR','glasnost.j1b.org','chaine','serveur glasnost',0);
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_GLASNOST_USER','user','chaine','Administrateur glasnost',0);
-insert into llx_const (name, value, type, note, visible) values ('ADHERENT_GLASNOST_PASS','password','chaine','password de l\'administrateur',0);
+insert into llx_const (name, value, type, note, visible) values ('ADHERENT_GLASNOST_PASS','password','chaine','password de l administrateur',0);
insert into llx_const (name, value, type, note, visible) values ('ADHERENT_USE_GLASNOST_AUTO','0','yesno','inscription automatique a glasnost ?',0);
--
-- SPIP
diff --git a/mysql/migration/2.1.0-2.2.0.sql b/mysql/migration/2.1.0-2.2.0.sql
index 3c51a24c40f..57cd823fdf3 100644
--- a/mysql/migration/2.1.0-2.2.0.sql
+++ b/mysql/migration/2.1.0-2.2.0.sql
@@ -104,9 +104,16 @@ ALTER TABLE llx_cotisation modify datef date;
ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh);
-- V4.1 update llx_cotisation set datef = ADDDATE(ADDDATE(dateadh, INTERVAL 1 YEAR),INTERVAL -1 DAY);
+
delete from llx_const where name='MAIN_SHOW_DEVELOPMENT_MODULES';
delete from llx_const where name='MAIN_ENABLE_DEVELOPMENT';
-insert into llx_const(name,value,type,visible,note) values('MAIN_FEATURES_LEVEL','0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development');
+DELETE FROM llx_const WHERE name = 'PRODUIT_CHANGE_PROD_DESC';
+DELETE FROM llx_const WHERE name like 'FICHINTER_ADDON%';
+insert into llx_const (name, value, type, visible) values ('FICHEINTER_ADDON', 'pacific','chaine',0);
+insert into llx_const (name, value, type, visible) values ('FICHEINTER_ADDON_PDF','soleil','chaine',0);
+
+INSERT INTO llx_const(name, value, type, note, visible) VALUES ('GENBARCODE_LOCATION','/usr/local/bin/genbarcode','chaine','location of genbarcode',0);
+insert into llx_const(name, value, type, visible, note) values('MAIN_FEATURES_LEVEL','0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development');
update llx_const set name='MAIN_MAIL_EMAIL_FROM' where name='NOTIFICATION_EMAIL_FROM';
@@ -119,6 +126,7 @@ update llx_const set value='rodolphe.php' where name='MAIN_MENU_BARRETOP'
update llx_const set value='rodolphe.php' where name='MAIN_MENUFRONT_BARRELEFT' and value='default.php';
update llx_const set value='rodolphe.php' where name='MAIN_MENUFRONT_BARRETOP' and value='default.php';
+
delete from llx_adherent_type where libelle IS NULL;
alter table llx_adherent_type modify libelle varchar(50) NOT NULL;
@@ -1013,8 +1021,6 @@ INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (6,
ALTER TABLE llx_product CHANGE gencode barcode varchar(255) DEFAULT NULL;
ALTER TABLE llx_product ADD COLUMN fk_barcode_type integer DEFAULT 0 after barcode;
-INSERT INTO llx_const (name, value, type, note, visible) VALUES ('GENBARCODE_LOCATION','/usr/local/bin/genbarcode','chaine','location of genbarcode',0);
-
create table llx_c_paper_format
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
@@ -1121,7 +1127,6 @@ ALTER TABLE llx_bank_account MODIFY iban_prefix varchar(50);
ALTER TABLE llx_bank_account ADD COLUMN country_iban varchar(2) after iban_prefix;
ALTER TABLE llx_bank_account ADD COLUMN cle_iban varchar(2) after country_iban;
-delete from llx_const where name='PRODUIT_CHANGE_PROD_DESC';
-- Mise � jour des pays
update llx_c_pays set libelle = 'Palaos' where rowid = 176 and code = 'PW' and libelle = 'Belau';
@@ -1163,8 +1168,6 @@ ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_factur
-- V4.1 update llx_societe_remise_except as re set re.fk_facture = (select fk_facture from llx_facturedet as fd where fd.rowid = re.fk_facture_line), re.fk_facture_line = NULL where re.fk_facture_line in (select rowid from llx_facturedet where description = '(CREDIT_NOTE)');
-- V4.1 delete from llx_facturedet where description = '(CREDIT_NOTE)';
-DELETE FROM llx_const WHERE name = 'PRODUIT_CHANGE_PROD_DESC';
-
ALTER TABLE llx_commande_fournisseurdet MODIFY fk_product integer;
-- Le prix d'un produit ne doit pas avoir la valeur NULL
--
GitLab