From d70beb872cdae50a8508a61f6525574c7a4c6b50 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 26 May 2009 12:25:26 +0000 Subject: [PATCH] Fix: errors in upgrade --- htdocs/includes/modules/modPhenix.class.php | 1 + htdocs/includes/modules/modProduit.class.php | 2 +- htdocs/includes/modules/modSociete.class.php | 2 +- htdocs/includes/modules/modWebcalendar.class.php | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/includes/modules/modPhenix.class.php b/htdocs/includes/modules/modPhenix.class.php index d763882ce9b..61f6100e9b9 100644 --- a/htdocs/includes/modules/modPhenix.class.php +++ b/htdocs/includes/modules/modPhenix.class.php @@ -107,6 +107,7 @@ class modPhenix extends DolibarrModules 'langs'=>'other', 'position'=>100, 'perms'=>'', + 'enabled'=>'$conf->phenix->enabled', 'target'=>'', 'user'=>0); $r++; diff --git a/htdocs/includes/modules/modProduit.class.php b/htdocs/includes/modules/modProduit.class.php index 3011a2cb2d2..affa8377b89 100644 --- a/htdocs/includes/modules/modProduit.class.php +++ b/htdocs/includes/modules/modProduit.class.php @@ -164,7 +164,7 @@ class modProduit extends DolibarrModules $this->import_entities_array[$r]=array('p.ref'=>"product",'p.fk_product_type'=>"product",'p.label'=>"product",'p.description'=>"product",'p.note'=>"product",'p.price'=>"product",'p.price_ttc'=>"product",'p.tva_tx'=>'product','p.envente'=>"product",'p.duration'=>"product"); $this->import_sql_start[$r]='INSERT INTO '.MAIN_DB_PREFIX.'produit as s'; - $this->import_sql_end[$r] .=''; + $this->import_sql_end[$r] =''; } diff --git a/htdocs/includes/modules/modSociete.class.php b/htdocs/includes/modules/modSociete.class.php index 891756b9a8d..cfcf55c7210 100644 --- a/htdocs/includes/modules/modSociete.class.php +++ b/htdocs/includes/modules/modSociete.class.php @@ -234,7 +234,7 @@ class modSociete extends DolibarrModules $this->import_entities_array[$r]=array('s.nom'=>"company",'s.prefix_comm'=>"company",'s.client'=>"company",'s.fournisseur'=>"company",'s.datec'=>"company",'s.tms'=>"company",'s.code_client'=>"company",'s.code_fournisseur'=>"company",'s.address'=>"company",'s.cp'=>"company",'s.ville'=>"company",'p.libelle'=>"company",'p.code'=>"company",'s.tel'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",'s.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note'=>"company",'t.libelle'=>"company",'ce.code'=>"company","cfj.libelle"=>"company",'s.fk_prospectlevel'=>'company','fk_stcomm'=>'company'); $this->import_sql_start[$r]='INSERT INTO '.MAIN_DB_PREFIX.'societe as s'; - $this->import_sql_end[$r] .=''; + $this->import_sql_end[$r] =''; } diff --git a/htdocs/includes/modules/modWebcalendar.class.php b/htdocs/includes/modules/modWebcalendar.class.php index 8e492dbc64d..104feae83bc 100644 --- a/htdocs/includes/modules/modWebcalendar.class.php +++ b/htdocs/includes/modules/modWebcalendar.class.php @@ -109,6 +109,7 @@ class modWebcalendar extends DolibarrModules 'langs'=>'other', 'position'=>100, 'perms'=>'', + 'enabled'=>'$conf->webcalendar->enabled', 'target'=>'', 'user'=>0 );