Merge branch 'master' of github.com:thelia/thelia

2013-09-16 10:17:35 +02:00
parent 5e3c10cd4f d4d876c783
commit 2468db3a00
41 changed files with 1760 additions and 1295 deletions
--- a/core/lib/Thelia/Model/Coupon.php
+++ b/core/lib/Thelia/Model/Coupon.php
@@ -76,7 +76,6 @@ class Coupon extends BaseCoupon
            ->setType($effect)
            ->setAmount($amount)
            ->setIsRemovingPostage($isRemovingPostage)
-            ->setType($amount)
            ->setIsEnabled($isEnabled)
            ->setExpirationDate($expirationDate)
            ->setIsAvailableOnSpecialOffers($isAvailableOnSpecialOffers)