Merge branch 'master' into tax

2013-10-24 10:37:05 +02:00
parent fb4e15ae77 60be64ef19
commit 4065f338b9
603 changed files with 164514 additions and 2787 deletions
--- a/core/lib/Thelia/Action/Order.php
+++ b/core/lib/Thelia/Action/Order.php
@@ -227,6 +227,7 @@ class Order extends BaseAction implements EventSubscriberInterface
                ->setWeight($pse->getWeight())
                ->setTaxRuleTitle($taxRuleI18n->getTitle())
                ->setTaxRuleDescription($taxRuleI18n->getDescription())
+                ->setEanCode($pse->getEanCode())
            ;
            $orderProduct->setDispatcher($this->getDispatcher());
            $orderProduct->save($con);