diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 7ab1a53d230..c45c045e11d 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1971,6 +1971,11 @@ function getElementProperties($element_type)
         $module='resource';
         $subelement='dolresource';
     }
+    if ($element_type == 'propaldet') {
+        $classpath = 'comm/propal/class';
+        $module='propal';
+        $subelement='propaleligne';
+    }
     $classfile = strtolower($subelement);
     $classname = ucfirst($subelement);
 
diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index 5f0ba0277b5..02b0f392ba4 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -22,8 +22,15 @@
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 
-ALTER TABLE llx_website ADD COLUMN virtualhost   varchar(255) after fk_default_home;
+ALTER TABLE llx_website ADD COLUMN virtualhost varchar(255) after fk_default_home;
 
 ALTER TABLE llx_chargesociales ADD COLUMN fk_account integer after fk_type;
 ALTER TABLE llx_chargesociales ADD COLUMN fk_mode_reglement integer after fk_account;
 
+ALTER TABLE llx_ecm_files ADD COLUMN gen_or_uploaded varchar(12) after cover; 
+
+DROP TABLE llx_document_generator;
+DROP TABLE llx_ecm_documents;
+
+
+
diff --git a/htdocs/install/mysql/tables/llx_ecm_files.sql b/htdocs/install/mysql/tables/llx_ecm_files.sql
index e984c7c9098..8310c160384 100644
--- a/htdocs/install/mysql/tables/llx_ecm_files.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_files.sql
@@ -27,7 +27,8 @@ CREATE TABLE llx_ecm_files
   description		text,
   keywords          text,                           -- list of keywords, separated with comma
   cover             text,                           -- is this file a file to use for a cover
-  extraparams		varchar(255),					-- for stock other parameters with json format
+  gen_or_uploaded   varchar(12),                    -- 'generated' or 'uploaded' 
+  extraparams		varchar(255),					-- for stocking other parameters with json format
   date_c			datetime,
   date_m			timestamp,
   fk_user_c			integer,
diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index 475fe219826..188a3fa7ce6 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -519,7 +519,7 @@ if (count($object->records) > 0)
                             element: \'websites\',
                             table_element: \'website\',
                             fk_element: '.$object->id.',
-                            value: encodeURIComponent(newurl),
+                            value: newurl,
                         },
                         context: document.body
                     });