diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index 3be559ca43..a4b5dc9b96 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -48,3 +48,4 @@ $lang->upgrade->fromVersions['1_1']       = '1.1';
 $lang->upgrade->fromVersions['1_2']       = '1.2';
 $lang->upgrade->fromVersions['1_3']       = '1.3';
 $lang->upgrade->fromVersions['1_4']       = '1.4';
+$lang->upgrade->fromVersions['1_5']       = '1.5';
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index 0767baa199..76e1601440 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -48,3 +48,4 @@ $lang->upgrade->fromVersions['1_1']       = '1.1';
 $lang->upgrade->fromVersions['1_2']       = '1.2';
 $lang->upgrade->fromVersions['1_3']       = '1.3';
 $lang->upgrade->fromVersions['1_4']       = '1.4';
+$lang->upgrade->fromVersions['1_5']       = '1.5';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 8805eefe3a..6a63a28d5e 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -160,6 +160,10 @@ class upgradeModel extends model
         {
             $this->upgradeFrom1_4To1_5();
         }
+        elseif($fromVersion == '1_5')
+        {
+            $this->upgradeFrom1_5To2_0();
+        }
 
         $this->setting->setSN();
     }
@@ -187,6 +191,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.5'));
         }
         elseif($fromVersion == '0_4beta')
         {
@@ -200,6 +205,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.5'));
         }
         elseif($fromVersion == '0_5beta')
         {
@@ -212,6 +218,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.5'));
         }
         elseif($fromVersion == '0_6beta')
         {
@@ -223,6 +230,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.5'));
         }
         elseif($fromVersion == '1_0beta')
         {
@@ -233,6 +241,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.5'));
         }
         elseif($fromVersion == '1_0rc1')
         {
@@ -242,6 +251,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.5'));
         }
         elseif($fromVersion == '1_0rc2' || $fromVersion == '1_0' || $fromVersion == '1_0_1')
         {
@@ -250,6 +260,7 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.5'));
         }
         elseif($fromVersion == '1_1')
         {
@@ -257,21 +268,29 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.5'));
         }
         elseif($fromVersion == '1_2')
         {
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.2'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.5'));
         }
         elseif($fromVersion == '1_3')
         {
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.5'));
         }
         elseif($fromVersion == '1_4')
         {
             $confirmContent .= file_get_contents($this->getUpgradeFile('1.4'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.5'));
+        }
+        elseif($fromVersion == '1_5')
+        {
+            $confirmContent .= file_get_contents($this->getUpgradeFile('1.5'));
         }
 
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
@@ -423,6 +442,7 @@ class upgradeModel extends model
         $this->updateTasks();
         if(!$this->isError()) $this->setting->updateVersion('1.4');
     }
+
     /**
      * Upgrade from 1.4 to 1.5.
      * 
@@ -435,6 +455,18 @@ class upgradeModel extends model
         if(!$this->isError()) $this->setting->updateVersion('1.5');
     }
 
+    /**
+     * Upgrade from 1.5 to 2.0.
+     * 
+     * @access private
+     * @return void
+     */
+    private function upgradeFrom1_5To2_0()
+    {
+        $this->execSQL($this->getUpgradeFile('1.5'));
+        if(!$this->isError()) $this->setting->updateVersion('2.0');
+    }
+
     /**
      * Update company field.
      *