Merge branch 'master' of https://github.com/thelia/thelia into coupon

# By Manuel Raynaud (8) and franck (2)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  en_EN -> en_UK, the "en_EN" locale does not exists.
  Smarty inheritance in admin template.
  fix typo in phpdoc
  complete test for foramt_number smarty function
  test foramt_date without datetime object
  create foramt_number smarty function
  remove sqlmap file
  add some phpdoc
  complete test for format_date smarty function
  create new smarty function for displaying date in expected format

Conflicts:
	reset_install.sh

core/lib/Thelia/Action/Coupon.php

@@ -71,6 +71,7 @@ class Coupon extends BaseAction implements EventSubscriberInterface
             $event
         );
 
+        $couponModel = CouponQuery::create();
         $event->getCreatedCoupon()->save();
 
         $this->dispatch(

core/lib/Thelia/Action/Currency.php

@@ -0,0 +1,120 @@
+<?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\Action;
+
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+use Thelia\Model\CurrencyQuery;
+use Thelia\Model\Currency as CurrencyModel;
+
+use Thelia\Core\Event\TheliaEvents;
+
+use Thelia\Core\Event\CurrencyChangeEvent;
+use Thelia\Core\Event\CurrencyCreateEvent;
+use Thelia\Core\Event\CurrencyDeleteEvent;
+
+class Currency extends BaseAction implements EventSubscriberInterface
+{
+    /**
+     * Create a new currencyuration entry
+     *
+     * @param CurrencyCreateEvent $event
+     */
+    public function create(CurrencyCreateEvent $event)
+    {
+        $currency = new CurrencyModel();
+
+        $currency
+            ->setDispatcher($this->getDispatcher())
+
+            ->setLocale($event->getLocale())
+            ->setName($event->getCurrencyName())
+            ->setSymbol($event->getSymbol())
+            ->setRate($event->getRate())
+            ->setCode($event->getCode())
+
+            ->save()
+        ;
+
+        $event->setCurrency($currency);
+    }
+
+    /**
+     * Change a currency
+     *
+     * @param CurrencyChangeEvent $event
+     */
+    public function modify(CurrencyChangeEvent $event)
+    {
+        $search = CurrencyQuery::create();
+
+        if (null !== $currency = CurrencyQuery::create()->findOneById($event->getCurrencyId())) {
+
+            $currency
+                ->setDispatcher($this->getDispatcher())
+
+                ->setLocale($event->getLocale())
+                ->setName($event->getCurrencyName())
+                ->setSymbol($event->getSymbol())
+                ->setRate($event->getRate())
+                ->setCode($event->getCode())
+
+                ->save();
+
+            $event->setCurrency($currency);
+        }
+    }
+
+    /**
+     * Delete a currencyuration entry
+     *
+     * @param CurrencyDeleteEvent $event
+     */
+    public function delete(CurrencyDeleteEvent $event)
+    {
+
+        if (null !== ($currency = CurrencyQuery::create()->findOneById($event->getCurrencyId()))) {
+
+            $currency
+                ->setDispatcher($this->getDispatcher())
+                ->delete()
+            ;
+
+            $event->setCurrency($currency);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public static function getSubscribedEvents()
+    {
+        return array(
+            TheliaEvents::CURRENCY_CREATE   => array("create", 128),
+            TheliaEvents::CURRENCY_MODIFY   => array("modify", 128),
+            TheliaEvents::CURRENCY_DELETE   => array("delete", 128),
+        );
+    }
+}