diff --git a/apps/maarch_entreprise/Views/basket-administration.component.html b/apps/maarch_entreprise/Views/basket-administration.component.html
index ed690a44c18410b9d5b21a140a9057d7434f37ca..202a1800bf017a652429dbbd43ce191d64458140 100644
--- a/apps/maarch_entreprise/Views/basket-administration.component.html
+++ b/apps/maarch_entreprise/Views/basket-administration.component.html
@@ -95,7 +95,7 @@
                         </ng-template>
                         <div class="col-md-6">
                             <mat-form-field style="margin-top:5px;">
-                                <mat-select id="actionPages" name="actionPages" placeholder="{{lang.resultPages}}" [(ngModel)]="group.result_page" (change)="updateResultPage(group)">
+                                <mat-select id="actionPages" name="actionPages" placeholder="{{lang.resultPage}}" [(ngModel)]="group.result_page" (change)="updateResultPage(group)">
                                     <mat-option *ngFor="let page of resultPages" [value]="page.id">
                                         {{page.label}}
                                     </mat-option>
diff --git a/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php b/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php
index 9aee01393f9f3b58bb294b505f093eb10fda9e66..bc8398f5613b90d9a74ff986f0e54825f25ddd85 100755
--- a/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php
+++ b/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php
@@ -628,7 +628,7 @@ abstract class business_app_tools_Abstract extends Database
             $_SESSION['maarch_entreprise']['xml_versionbase'] = 'none';
         }
         $checkBase = new Database();
-        $query = "SELECT param_value_int, param_value_string FROM " . PARAM_TABLE
+        $query = "SELECT param_value_string FROM " . PARAM_TABLE
                . " WHERE id = 'database_version'";
 
         $stmt = $checkBase->query($query); //Find value in parameters table on database
@@ -636,10 +636,8 @@ abstract class business_app_tools_Abstract extends Database
             $_SESSION['maarch_entreprise']['database_version'] = "none";
         } else {
             $vbg = $stmt->fetchObject();
-            $_SESSION['maarch_entreprise']
-                ['database_version'] = $vbg->param_value_int;
-            $_SESSION['maarch_entreprise']
-                ['database_version_minor'] = $vbg->param_value_string;
+            $_SESSION['maarch_entreprise']['database_version'] = $vbg->param_value_string;
+            $_SESSION['maarch_entreprise']['database_version_minor'] = $vbg->param_value_string;
         }
         //If this two parameters is not find, this is the end of this function
         if ($_SESSION['maarch_entreprise']['xml_versionbase'] <> 'none' ) {
diff --git a/apps/maarch_entreprise/xml/database_version.xml b/apps/maarch_entreprise/xml/database_version.xml
index b0568818874f75fb794c12caeb85deefd54c8535..e4f1e794e92c44ec2e930ceb6f41bba78c4b90e1 100755
--- a/apps/maarch_entreprise/xml/database_version.xml
+++ b/apps/maarch_entreprise/xml/database_version.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-    <database_version>1706</database_version> <!-- 17.06 -->
+    <database_version>18.04.1</database_version> <!-- 18.04 -->
 </root>
diff --git a/sql/data_fr.sql b/sql/data_fr.sql
index 5305f324b0a5a5edb952b853c8f1af89a326c60b..c475e2cb151f2b1d297fc1ab7ebdb1a15d1f51fd 100755
--- a/sql/data_fr.sql
+++ b/sql/data_fr.sql
@@ -1139,7 +1139,7 @@ INSERT INTO parameters (id, param_value_string, param_value_int, param_value_dat
 INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('folder_id_increment', '', 200, NULL);
 INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('work_batch_autoimport_id', NULL, 1, NULL);
 INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('postindexing_workbatch', NULL, 1, NULL);
-INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('database_version', '17.06.2', 1706, NULL);
+INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('database_version', '18.04.1', NULL, NULL);
 INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('user_quota', '', 0, NULL);
 ------------
 --DIFFLIST_TYPES
diff --git a/sql/develop.sql b/sql/develop.sql
index 2a83ecb15d32b6a683f2c42398867eec81e0b0a4..ff7d476073a79b2b293ff60773701d5bc7b845b2 100755
--- a/sql/develop.sql
+++ b/sql/develop.sql
@@ -751,3 +751,5 @@ UPDATE notifications SET event_id = 'baskets' WHERE notification_id = 'BASKETS';
 
 DELETE FROM parameters where id = 'user_quota';
 INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('user_quota', '', 0, NULL);
+DELETE FROM parameters where id = 'database_version';
+INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('database_version', '18.04.1', NULL, NULL);