From b9577e87e3a20a313a09f28452bc453242f98561 Mon Sep 17 00:00:00 2001
From: gmorel <gmorel@openstudio.fr>
Date: Wed, 4 Sep 2013 16:23:16 +0200
Subject: [PATCH] Merge branch 'master' of https://github.com/thelia/thelia
 into coupon

# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
  WIP : Comment of route url-rewriting.check
  Working : Fix script reset
  Working : Cleanup admin new version bootstrap v3
  Working : Finish renaming class for bootstrap migration
  Working : Major class changes migration from bootstrap 2.x to 3.0

Conflicts:
	reset_install.sh
	templates/admin/default/assets/css/admin.less
---
 core/lib/Thelia/Controller/Admin/CouponController.php | 6 +++---
 templates/admin/default/coupon/form.html              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php
index 5c33765d3..7fd9783ba 100755
--- a/core/lib/Thelia/Controller/Admin/CouponController.php
+++ b/core/lib/Thelia/Controller/Admin/CouponController.php
@@ -118,9 +118,9 @@ class CouponController extends BaseAdminController
                 );
                 $this->adminLogAppend(
                     sprintf(
-                        'Coupon %s (ID %s) created',
-                        $couponEvent->getTitle(),
-                        $couponEvent->getCoupon()->getId()
+                        'Coupon %s (ID ) created',
+                        $couponEvent->getTitle()
+//                        $couponEvent->getCoupon()->getId()
                     )
                 );
                 // @todo redirect if successful
diff --git a/templates/admin/default/coupon/form.html b/templates/admin/default/coupon/form.html
index 1bd18a6a8..b715cd741 100644
--- a/templates/admin/default/coupon/form.html
+++ b/templates/admin/default/coupon/form.html
@@ -72,7 +72,7 @@
                     <label for="expiration-date">Expiration date :</label>
                     <div class="input-append date" data-date="12/02/2012" data-date-format="dd/mm/yyyy">
                         {form_field form=$form field='expirationDate'}
-                            <input type="text" id="expiration-date" name="expiration-date" value="{$value}">
+                            <input type="text" id="expiration-date" name="{$name}" value="{$value}">
                             {if $error}{$message}{/if}
                         {/form_field}
                         <span class="add-on"><span class="icon-th"></span></span>