diff --git a/core/lib/Thelia/Core/Template/Smarty/Exception/SmartyPluginException.php b/core/lib/Thelia/Core/Template/Smarty/Exception/SmartyPluginException.php
new file mode 100644
index 000000000..fdaf93608
--- /dev/null
+++ b/core/lib/Thelia/Core/Template/Smarty/Exception/SmartyPluginException.php
@@ -0,0 +1,33 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Core\Template\Smarty\Exception;
+
+
+/**
+ * Class SmartyPluginException
+ * @package Thelia\Core\Template\Smarty\Exception
+ * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ */
+class SmartyPluginException extends \SmartyException
+{}
\ No newline at end of file
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
index ce7ba68c8..7404a2a6f 100644
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
@@ -25,9 +25,13 @@ namespace Thelia\Core\Template\Smarty\Plugins;
 
 use Thelia\Core\HttpFoundation\Request;
 use Thelia\Core\Template\Smarty\AbstractSmartyPlugin;
+use Thelia\Core\Template\Smarty\Exception\SmartyPluginException;
 use Thelia\Core\Template\Smarty\SmartyPluginDescriptor;
 
 /**
+ *
+ * format_date and format_date smarty function.
+ *
  * Class Format
  * @package Thelia\Core\Template\Smarty\Plugins
  * @author Manuel Raynaud <mraynaud@openstudio.fr>
@@ -44,14 +48,31 @@ class Format extends AbstractSmartyPlugin
     /**
      * return date in expected format
      *
-     * ex : {format_date date=$dateTimeObject format="Y-m-d H:i:s"}
+     * available parameters :
+     *  date => DateTime objet (mandatory)
+     *  format => expected format
+     *  output => list of default system format. Values available :
+     *      date => date format
+     *      time => time format
+     *      datetime => datetime format (default)
+     *
+     * ex :
+     *  {format_date date=$dateTimeObject format="Y-m-d H:i:s"} will output the format with specific format
+     *  {format_date date=$dateTimeObject output="date"} will output the date using the default date system format
+     *  {format_date date=$dateTimeObject} will output with the default datetime system format
      *
      * @param array $params
      * @param null $template
+     * @throws \Thelia\Core\Template\Smarty\Exception\SmartyPluginException
      * @return string
      */
     public function formatDate($params, $template = null)
     {
+
+        if (array_key_exists("date", $params) === false) {
+            throw new SmartyPluginException("date is a mandatory parameter in format_date function");
+        }
+
         $date = $params["date"];
 
         if(!$date instanceof \DateTime) {
@@ -87,9 +108,36 @@ class Format extends AbstractSmartyPlugin
 
     }
 
+    /**
+     *
+     * display numbers in expected format
+     *
+     * available parameters :
+     *  number => int or float number
+     *  decimals => how many decimals format expected
+     *  dec_point => separator for the decimal point
+     *  thousands_sep => thousands separator
+     *
+     *
+     * @param $params
+     * @param null $template
+     * @throws \Thelia\Core\Template\Smarty\Exception\SmartyPluginException
+     * @return string the expected number formatted
+     */
     public function formatNumber($params, $template = null)
     {
+        if (array_key_exists("number", $params) ===  false) {
+            throw new SmartyPluginException("number is a mandatory parameter in format_number function");
+        }
 
+        $lang = $this->request->getSession()->getLang();
+
+        $number = $params["number"];
+        $decimals = array_key_exists("decimals", $params) ? $params["decimals"] : $lang->getDecimals();
+        $decPoint = array_key_exists("dec_point", $params) ? $params["dec_point"] : $lang->getDecimalSeparator();
+        $thousandsSep = array_key_exists("thousands_sep", $params) ? $params["thousands_sep"] : $lang->getThousandsSeparator();
+
+        return number_format($number, $decimals, $decPoint, $thousandsSep);
     }
 
     /**
diff --git a/core/lib/Thelia/Model/Lang.php b/core/lib/Thelia/Model/Lang.php
index cb89b53e1..654c89719 100755
--- a/core/lib/Thelia/Model/Lang.php
+++ b/core/lib/Thelia/Model/Lang.php
@@ -44,7 +44,7 @@ class Lang extends BaseLang {
         return ".";
     }
 
-    public function getThousandSeparator()
+    public function getThousandsSeparator()
     {
         return " ";
     }