Merge branch 'loops'

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml

core/lib/Thelia/Config/Resources/config.xml

@@ -11,6 +11,9 @@
         <loop class="Thelia\Core\Template\Loop\Category" name="category"/>
         <loop class="Thelia\Core\Template\Loop\Country" name="country"/>
         <loop class="Thelia\Core\Template\Loop\Customer" name="customer"/>
+        <loop class="Thelia\Core\Template\Loop\Feature" name="feature"/>
+        <loop class="Thelia\Core\Template\Loop\FeatureAvailable" name="feature_available"/>
+        <loop class="Thelia\Core\Template\Loop\FeatureValue" name="feature_value"/>
         <loop class="Thelia\Core\Template\Loop\Order" name="order"/>
         <loop class="Thelia\Core\Template\Loop\OrderStatus" name="order-status"/>
         <loop class="Thelia\Core\Template\Loop\Product" name="product"/>

core/lib/Thelia/Core/Template/Element/BaseLoop.php

@@ -45,8 +45,9 @@ abstract class BaseLoop
      * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
      */
     protected $dispatcher;
+
     /**
-     * @var Thelia\Core\Security\SecurityContext
+     * @var SecurityContext
      */
     protected $securityContext;
 
@@ -56,9 +57,9 @@ abstract class BaseLoop
     /**
      * Create a new Loop
      *
-     * @param \Symfony\Component\HttpFoundation\Request                   $request
+     * @param Request                  $request
-     * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
+     * @param EventDispatcherInterface $dispatcher
-     * @param Thelia\Core\Security\SecurityContext $securityContext
+     * @param SecurityContext          $securityContext
      */
     public function __construct(Request $request, EventDispatcherInterface $dispatcher, SecurityContext $securityContext)
     {
@@ -66,20 +67,20 @@ abstract class BaseLoop
         $this->dispatcher = $dispatcher;
         $this->securityContext = $securityContext;
 
-        $this->args = $this->getArgDefinitions()->addArguments($this->getDefaultArgs());
+        $this->args = $this->getArgDefinitions()->addArguments($this->getDefaultArgs(), false);
     }
 
     /**
      * Define common loop arguments
      *
-     * @return an array ofL \Thelia\Core\Template\Loop\Argument\Argument
+     * @return Argument[]
      */
     protected function getDefaultArgs()
     {
     	return array(
-    			Argument::createIntTypeArgument('offset', 0),
+            Argument::createIntTypeArgument('offset', 0),
-    			Argument::createIntTypeArgument('page'),
+            Argument::createIntTypeArgument('page'),
-    			Argument::createIntTypeArgument('limit', 10),
+            Argument::createIntTypeArgument('limit', 10),
     	);
     }
 
@@ -87,7 +88,9 @@ abstract class BaseLoop
      * Provides a getter to loop parameters
      *
      * @param string $name the methode name (only getArgname is supported)
-     * @param mixed $arguments this parameter is ignored
+     * @param $arguments this parameter is ignored
+     *
+     * @return null
      * @throws \InvalidArgumentException if the parameter is unknown or the method name is not supported.
      */
     public function __call($name, $arguments) {

core/lib/Thelia/Core/Template/Loop/Address.php

@@ -115,9 +115,6 @@ class Address extends BaseLoop
         $loopResult = new LoopResult();
 
         foreach ($addresses as $address) {
-
-            if ($this->not_empty && $address->countAllProducts() == 0) continue;
-
             $loopResultRow = new LoopResultRow();
             $loopResultRow->set("ID", $address->getId());
             $loopResultRow->set("NAME", $address->getName());

core/lib/Thelia/Core/Template/Loop/Argument/ArgumentCollection.php

@@ -34,7 +34,7 @@ class ArgumentCollection implements \Iterator
 
     public function __construct()
     {
-        $this->addArguments(func_get_args());
+        $this->addArguments(func_get_args(), true);
     }
 
     public function hasKey($key) {
@@ -51,14 +51,15 @@ class ArgumentCollection implements \Iterator
     }
 
     /**
-     * @param array $argumentList
+     * @param array    $argumentList
+     * @param          $force
      *
      * @return ArgumentCollection
      */
-    public function addArguments(array $argumentList)
+    public function addArguments(array $argumentList, $force = true)
     {
         foreach($argumentList as $argument) {
-            $this->addArgument($argument);
+            $this->addArgument($argument, $force);
         }
 
         return $this;
@@ -66,11 +67,16 @@ class ArgumentCollection implements \Iterator
 
     /**
      * @param Argument $argument
+     * @param          $force
      *
      * @return ArgumentCollection
      */
-    public function addArgument(Argument $argument)
+    public function addArgument(Argument $argument, $force = true)
     {
+        if(isset($this->arguments[$argument->name]) && ! $force) {
+            return $this;
+        }
+
         $this->arguments[$argument->name] = $argument;
 
         return $this;

core/lib/Thelia/Core/Template/Loop/Country.php

@@ -32,7 +32,7 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 use Thelia\Log\Tlog;
 
-use Thelia\Model\CustomerCountryQuery;
+use Thelia\Model\CountryQuery;
 use Thelia\Model\ConfigQuery;
 use Thelia\Type\TypeCollection;
 use Thelia\Type;
@@ -54,7 +54,11 @@ class Country extends BaseLoop
     protected function getArgDefinitions()
     {
         return new ArgumentCollection(
-            Argument::createIntListTypeArgument('id')
+            Argument::createIntTypeArgument('limit', 500), // overwrite orginal param to increase the limit
+            Argument::createIntListTypeArgument('id'),
+            Argument::createIntListTypeArgument('area'),
+            Argument::createBooleanTypeArgument('with_area'),
+            Argument::createIntListTypeArgument('exclude')
         );
     }
 
@@ -65,7 +69,7 @@ class Country extends BaseLoop
      */
     public function exec(&$pagination)
     {
-        $search = CustomerCountryQuery::create();
+        $search = CountryQuery::create();
 
 		$id = $this->getId();
 
@@ -73,6 +77,26 @@ class Country extends BaseLoop
             $search->filterById($id, Criteria::IN);
         }
 
+        $area = $this->getArea();
+
+        if (null !== $area) {
+            $search->filterByAreaId($area, Criteria::IN);
+        }
+
+        $withArea = $this->getWith_area();
+
+        if (true === $withArea) {
+            $search->filterByAreaId(null, Criteria::ISNOTNULL);
+        } elseif (false == $withArea) {
+            $search->filterByAreaId(null, Criteria::ISNULL);
+        }
+
+        $exclude = $this->getExclude();
+
+        if (!is_null($exclude)) {
+            $search->filterById($exclude, Criteria::NOT_IN);
+        }
+
         /**
          * Criteria::INNER_JOIN in second parameter for joinWithI18n  exclude query without translation.
          *
@@ -84,21 +108,23 @@ class Country extends BaseLoop
             (ConfigQuery::read("default_lang_without_translation", 1)) ? Criteria::LEFT_JOIN : Criteria::INNER_JOIN
         );
 
-        $search->orderByPosition();
+        $search->addAscendingOrderByColumn(\Thelia\Model\Map\CountryI18nTableMap::TITLE);
 
-        $countrys = $this->search($search, $pagination);
+        $countries = $this->search($search, $pagination);
 
         $loopResult = new LoopResult();
 
-        foreach ($countrys as $country) {
+        foreach ($countries as $country) {
-
-            if ($this->not_empty && $country->countAllProducts() == 0) continue;
-
             $loopResultRow = new LoopResultRow();
             $loopResultRow->set("ID", $country->getId());
-            $loopResultRow->set("DEFAULT", $country->getByDefault());
+            $loopResultRow->set("AREA", $country->getAreaId());
-            $loopResultRow->set("SHORT", $country->getShort());
+            $loopResultRow->set("TITLE", $country->getTitle());
-            $loopResultRow->set("LONG", $country->getLong());
+            $loopResultRow->set("CHAPO", $country->getChapo());
+            $loopResultRow->set("DESCRIPTION", $country->getDescription());
+            $loopResultRow->set("POSTSCRIPTUM", $country->getPostscriptum());
+            $loopResultRow->set("ISOCODE", $country->getIsocode());
+            $loopResultRow->set("ISOALPHA2", $country->getIsoalpha2());
+            $loopResultRow->set("ISOALPHA3", $country->getIsoalpha3());
 
             $loopResult->addRow($loopResultRow);
         }

core/lib/Thelia/Core/Template/Loop/Customer.php

@@ -118,9 +118,6 @@ class Customer extends BaseLoop
         $loopResult = new LoopResult();
 
         foreach ($customers as $customer) {
-
-            if ($this->not_empty && $customer->countAllProducts() == 0) continue;
-
             $loopResultRow = new LoopResultRow();
             $loopResultRow->set("ID", $customer->getId());
             $loopResultRow->set("REF", $customer->getRef());

core/lib/Thelia/Core/Template/Loop/Feature.php

@@ -0,0 +1,168 @@
+<?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\Loop;
+
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\Join;
+use Thelia\Core\Template\Element\BaseLoop;
+use Thelia\Core\Template\Element\LoopResult;
+use Thelia\Core\Template\Element\LoopResultRow;
+
+use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
+use Thelia\Core\Template\Loop\Argument\Argument;
+use Thelia\Log\Tlog;
+
+use Thelia\Model\Base\CategoryQuery;
+use Thelia\Model\Base\ProductCategoryQuery;
+use Thelia\Model\Base\FeatureQuery;
+use Thelia\Model\ConfigQuery;
+use Thelia\Model\Map\ProductCategoryTableMap;
+use Thelia\Type\TypeCollection;
+use Thelia\Type;
+
+/**
+ *
+ * Feature loop
+ *
+ *
+ * Class Feature
+ * @package Thelia\Core\Template\Loop
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ */
+class Feature extends BaseLoop
+{
+    /**
+     * @return ArgumentCollection
+     */
+    protected function getArgDefinitions()
+    {
+        return new ArgumentCollection(
+            Argument::createIntListTypeArgument('id'),
+            Argument::createIntListTypeArgument('product'),
+            Argument::createIntListTypeArgument('category'),
+            Argument::createBooleanTypeArgument('visible', 1),
+            Argument::createIntListTypeArgument('exclude'),
+            new Argument(
+                'order',
+                new TypeCollection(
+                    new Type\EnumListType(array('alpha', 'alpha_reverse', 'manual', 'manual_reverse'))
+                ),
+                'manual'
+            )
+        );
+    }
+
+    /**
+     * @param $pagination
+     *
+     * @return \Thelia\Core\Template\Element\LoopResult
+     */
+    public function exec(&$pagination)
+    {
+        $search = FeatureQuery::create();
+
+        $id = $this->getId();
+
+        if (null !== $id) {
+            $search->filterById($id, Criteria::IN);
+        }
+
+        $exclude = $this->getExclude();
+
+        if (null !== $exclude) {
+            $search->filterById($exclude, Criteria::NOT_IN);
+        }
+
+        $visible = $this->getVisible();
+
+        $search->filterByVisible($visible);
+
+        $product = $this->getProduct();
+        $category = $this->getCategory();
+
+        if(null !== $product) {
+            $productCategories = ProductCategoryQuery::create()->select(array(ProductCategoryTableMap::CATEGORY_ID))->filterByProductId($product, Criteria::IN)->find()->getData();
+
+            if(null === $category) {
+                $category = $productCategories;
+            } else {
+                $category = array_merge($category, $productCategories);
+            }
+        }
+
+        if(null !== $category) {
+            $search->filterByCategory(
+                CategoryQuery::create()->filterById($category)->find(),
+                Criteria::IN
+            );
+        }
+
+        $orders  = $this->getOrder();
+
+        foreach($orders as $order) {
+            switch ($order) {
+                case "alpha":
+                    $search->addAscendingOrderByColumn(\Thelia\Model\Map\FeatureI18nTableMap::TITLE);
+                    break;
+                case "alpha_reverse":
+                    $search->addDescendingOrderByColumn(\Thelia\Model\Map\FeatureI18nTableMap::TITLE);
+                    break;
+                case "manual":
+                    $search->orderByPosition(Criteria::ASC);
+                    break;
+                case "manual_reverse":
+                    $search->orderByPosition(Criteria::DESC);
+                    break;
+            }
+        }
+
+        /**
+         * Criteria::INNER_JOIN in second parameter for joinWithI18n  exclude query without translation.
+         *
+         * @todo : verify here if we want results for row without translations.
+         */
+
+        $search->joinWithI18n(
+            $this->request->getSession()->getLocale(),
+            (ConfigQuery::read("default_lang_without_translation", 1)) ? Criteria::LEFT_JOIN : Criteria::INNER_JOIN
+        );
+
+        $features = $this->search($search, $pagination);
+
+        $loopResult = new LoopResult();
+
+        foreach ($features as $feature) {
+            $loopResultRow = new LoopResultRow();
+            $loopResultRow->set("ID", $feature->getId());
+            $loopResultRow->set("TITLE",$feature->getTitle());
+            $loopResultRow->set("CHAPO", $feature->getChapo());
+            $loopResultRow->set("DESCRIPTION", $feature->getDescription());
+            $loopResultRow->set("POSTSCRIPTUM", $feature->getPostscriptum());
+
+            $loopResult->addRow($loopResultRow);
+        }
+
+        return $loopResult;
+    }
+}

core/lib/Thelia/Core/Template/Loop/FeatureAvailable.php

@@ -0,0 +1,145 @@
+<?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\Loop;
+
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\Join;
+use Thelia\Core\Template\Element\BaseLoop;
+use Thelia\Core\Template\Element\LoopResult;
+use Thelia\Core\Template\Element\LoopResultRow;
+
+use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
+use Thelia\Core\Template\Loop\Argument\Argument;
+use Thelia\Log\Tlog;
+
+use Thelia\Model\Base\FeatureAvQuery;
+use Thelia\Model\ConfigQuery;
+use Thelia\Type\TypeCollection;
+use Thelia\Type;
+
+/**
+ *todo : to be finished
+ * FeatureAvailable loop
+ *
+ *
+ * Class FeatureAvailable
+ * @package Thelia\Core\Template\Loop
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ */
+class FeatureAvailable extends BaseLoop
+{
+    /**
+     * @return ArgumentCollection
+     */
+    protected function getArgDefinitions()
+    {
+        return new ArgumentCollection(
+            Argument::createIntListTypeArgument('id'),
+            Argument::createIntListTypeArgument('feature'),
+            Argument::createIntListTypeArgument('exclude'),
+            new Argument(
+                'order',
+                new TypeCollection(
+                    new Type\EnumListType(array('alpha', 'alpha_reverse', 'manual', 'manual_reverse'))
+                ),
+                'manual'
+            )
+        );
+    }
+
+    /**
+     * @param $pagination
+     *
+     * @return \Thelia\Core\Template\Element\LoopResult
+     */
+    public function exec(&$pagination)
+    {
+        $search = FeatureAvQuery::create();
+
+        $id = $this->getId();
+
+        if (null !== $id) {
+            $search->filterById($id, Criteria::IN);
+        }
+
+        $exclude = $this->getExclude();
+
+        if (null !== $exclude) {
+            $search->filterById($exclude, Criteria::NOT_IN);
+        }
+
+        $feature = $this->getFeature();
+
+        if(null !== $feature) {
+            $search->filterByFeatureId($feature, Criteria::IN);
+        }
+
+        $orders  = $this->getOrder();
+
+        foreach($orders as $order) {
+            switch ($order) {
+                case "alpha":
+                    $search->addAscendingOrderByColumn(\Thelia\Model\Map\FeatureAvI18nTableMap::TITLE);
+                    break;
+                case "alpha_reverse":
+                    $search->addDescendingOrderByColumn(\Thelia\Model\Map\FeatureAvI18nTableMap::TITLE);
+                    break;
+                case "manual":
+                    $search->orderByPosition(Criteria::ASC);
+                    break;
+                case "manual_reverse":
+                    $search->orderByPosition(Criteria::DESC);
+                    break;
+            }
+        }
+
+        /**
+         * Criteria::INNER_JOIN in second parameter for joinWithI18n  exclude query without translation.
+         *
+         * @todo : verify here if we want results for row without translations.
+         */
+
+        $search->joinWithI18n(
+            $this->request->getSession()->getLocale(),
+            (ConfigQuery::read("default_lang_without_translation", 1)) ? Criteria::LEFT_JOIN : Criteria::INNER_JOIN
+        );
+
+        $featuresAv = $this->search($search, $pagination);
+
+        $loopResult = new LoopResult();
+
+        foreach ($featuresAv as $featureAv) {
+            $loopResultRow = new LoopResultRow();
+            $loopResultRow->set("ID", $featureAv->getId());
+            $loopResultRow->set("TITLE",$featureAv->getTitle());
+            $loopResultRow->set("CHAPO", $featureAv->getChapo());
+            $loopResultRow->set("DESCRIPTION", $featureAv->getDescription());
+            $loopResultRow->set("POSTSCRIPTUM", $featureAv->getPostscriptum());
+
+            $loopResult->addRow($loopResultRow);
+        }
+
+        return $loopResult;
+    }
+}

core/lib/Thelia/Core/Template/Loop/FeatureValue.php

@@ -0,0 +1,153 @@
+<?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\Loop;
+
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\Join;
+use Thelia\Core\Template\Element\BaseLoop;
+use Thelia\Core\Template\Element\LoopResult;
+use Thelia\Core\Template\Element\LoopResultRow;
+
+use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
+use Thelia\Core\Template\Loop\Argument\Argument;
+use Thelia\Log\Tlog;
+
+use Thelia\Model\Base\FeatureProductQuery;
+use Thelia\Model\ConfigQuery;
+use Thelia\Type\TypeCollection;
+use Thelia\Type;
+
+/**
+ *
+ * FeatureValue loop
+ *
+ *
+ * Class FeatureValue
+ * @package Thelia\Core\Template\Loop
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ */
+class FeatureValue extends BaseLoop
+{
+    /**
+     * @return ArgumentCollection
+     */
+    protected function getArgDefinitions()
+    {
+        return new ArgumentCollection(
+            Argument::createIntTypeArgument('feature', null, true),
+            Argument::createIntTypeArgument('product', null, true),
+            Argument::createIntListTypeArgument('feature_available'),
+            Argument::createBooleanTypeArgument('exclude_feature_available', 0),
+            Argument::createBooleanTypeArgument('exclude_default_values', 0),
+            new Argument(
+                'order',
+                new TypeCollection(
+                    new Type\EnumListType(array('alpha', 'alpha_reverse', 'manual', 'manual_reverse'))
+                ),
+                'manual'
+            )
+        );
+    }
+
+    /**
+     * @param $pagination
+     *
+     * @return \Thelia\Core\Template\Element\LoopResult
+     */
+    public function exec(&$pagination)
+    {
+        $search = FeatureProductQuery::create();
+
+        $feature = $this->getFeature();
+
+        $search->filterByFeatureId($feature, Criteria::EQUAL);
+
+        $product = $this->getProduct();
+
+        $search->filterByProductId($product, Criteria::EQUAL);
+
+        $featureAvailable = $this->geFeature_available();
+
+        if (null !== $featureAvailable) {
+            $search->filterByFeatureAvId($featureAvailable, Criteria::IN);
+        }
+
+        $excludeFeatureAvailable = $this->getExclude_feature_available();
+        if($excludeFeatureAvailable == true) {
+            $search->filterByFeatureAvId(null, Criteria::NULL);
+        }
+
+        $excludeDefaultValues = $this->getExclude_default_values();
+        if($excludeDefaultValues == true) {
+            $search->filterByByDefault(null, Criteria::NULL);
+        }
+
+        $orders  = $this->getOrder();
+
+        foreach($orders as $order) {
+            switch ($order) {
+                case "alpha":
+                    $search->addAscendingOrderByColumn(\Thelia\Model\Map\FeatureI18nTableMap::TITLE);
+                    break;
+                case "alpha_reverse":
+                    $search->addDescendingOrderByColumn(\Thelia\Model\Map\FeatureI18nTableMap::TITLE);
+                    break;
+                case "manual":
+                    $search->orderByPosition(Criteria::ASC);
+                    break;
+                case "manual_reverse":
+                    $search->orderByPosition(Criteria::DESC);
+                    break;
+            }
+        }
+
+        /**
+         * Criteria::INNER_JOIN in second parameter for joinWithI18n  exclude query without translation.
+         *
+         * @todo : verify here if we want results for row without translations.
+         */
+
+        /*$search->joinWithI18n(
+            $this->request->getSession()->getLocale(),
+            (ConfigQuery::read("default_lang_without_translation", 1)) ? Criteria::LEFT_JOIN : Criteria::INNER_JOIN
+        );*/
+
+        $featureValues = $this->search($search, $pagination);
+
+        $loopResult = new LoopResult();
+
+        foreach ($featureValues as $featureValue) {
+            $loopResultRow = new LoopResultRow();
+            $loopResultRow->set("ID", $featureValue->getId());
+            /*$loopResultRow->set("TITLE",$featureValue->getTitle());
+            $loopResultRow->set("CHAPO", $featureValue->getChapo());
+            $loopResultRow->set("DESCRIPTION", $featureValue->getDescription());
+            $loopResultRow->set("POSTSCRIPTUM", $featureValue->getPostscriptum());*/
+
+            $loopResult->addRow($loopResultRow);
+        }
+
+        return $loopResult;
+    }
+}

core/lib/Thelia/Core/Template/Loop/Product.php

@@ -33,11 +33,11 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 use Thelia\Log\Tlog;
 
-use Thelia\Model\Base\FeatureProdQuery;
+use Thelia\Model\Base\FeatureProductQuery;
 use Thelia\Model\CategoryQuery;
 use Thelia\Model\FeatureAvQuery;
 use Thelia\Model\FeatureQuery;
-use Thelia\Model\Map\FeatureProdTableMap;
+use Thelia\Model\Map\FeatureProductTableMap;
 use Thelia\Model\Map\ProductTableMap;
 use Thelia\Model\ProductCategoryQuery;
 use Thelia\Model\ProductQuery;
@@ -70,13 +70,13 @@ class Product extends BaseLoop
                 )
             ),
             Argument::createIntListTypeArgument('category'),
-            Argument::createBooleanTypeArgument('new'),
+            //Argument::createBooleanTypeArgument('new'),
-            Argument::createBooleanTypeArgument('promo'),
+            //Argument::createBooleanTypeArgument('promo'),
-            Argument::createFloatTypeArgument('min_price'),
+            //Argument::createFloatTypeArgument('min_price'),
-            Argument::createFloatTypeArgument('max_price'),
+            //Argument::createFloatTypeArgument('max_price'),
-            Argument::createIntTypeArgument('min_stock'),
+            //Argument::createIntTypeArgument('min_stock'),
-            Argument::createFloatTypeArgument('min_weight'),
+            //Argument::createFloatTypeArgument('min_weight'),
-            Argument::createFloatTypeArgument('max_weight'),
+            //Argument::createFloatTypeArgument('max_weight'),
             Argument::createBooleanTypeArgument('current'),
             Argument::createBooleanTypeArgument('current_category'),
             Argument::createIntTypeArgument('depth', 1),
@@ -84,7 +84,7 @@ class Product extends BaseLoop
             new Argument(
                 'order',
                 new TypeCollection(
-                    new Type\EnumListType(array('alpha', 'alpha_reverse', 'min_price', 'max_price', 'manual', 'manual_reverse', 'ref', 'promo', 'new', 'random', 'given_id'))
+                    new Type\EnumListType(array('alpha', 'alpha_reverse', /*'min_price', 'max_price',*/ 'manual', 'manual_reverse', 'ref', /*'promo', 'new',*/ 'random', 'given_id'))
                 ),
                 'manual'
             ),
@@ -114,7 +114,7 @@ class Product extends BaseLoop
     {
         $search = ProductQuery::create();
 
-        $search->withColumn('CASE WHEN ' . ProductTableMap::PROMO . '=1 THEN ' . ProductTableMap::PRICE2 . ' ELSE ' . ProductTableMap::PRICE . ' END', 'real_price');
+        //$search->withColumn('CASE WHEN ' . ProductTableMap::PROMO . '=1 THEN ' . ProductTableMap::PRICE2 . ' ELSE ' . ProductTableMap::PRICE . ' END', 'real_price');
 
         $id = $this->getId();
 
@@ -147,7 +147,7 @@ class Product extends BaseLoop
             );
         }
 
-        $new = $this->getNew();
+        /*$new = $this->getNew();
 
         if ($new === true) {
             $search->filterByNewness(1, Criteria::EQUAL);
@@ -169,15 +169,15 @@ class Product extends BaseLoop
             $search->filterByQuantity($min_stock, Criteria::GREATER_EQUAL);
         }
 
-        $min_price = $this->getMin_price();
+        $min_price = $this->getMin_price();*/
 
-        if(null !== $min_price) {
+        //if(null !== $min_price) {
             /**
              * Following should work but does not :
              *
              *  $search->filterBy('real_price', $max_price, Criteria::GREATER_EQUAL);
              */
-            $search->condition('in_promo', ProductTableMap::PROMO . Criteria::EQUAL . '1')
+            /*$search->condition('in_promo', ProductTableMap::PROMO . Criteria::EQUAL . '1')
                     ->condition('not_in_promo', ProductTableMap::PROMO . Criteria::NOT_EQUAL . '1')
                     ->condition('min_price2', ProductTableMap::PRICE2 . Criteria::GREATER_EQUAL . '?', $min_price)
                     ->condition('min_price', ProductTableMap::PRICE . Criteria::GREATER_EQUAL . '?', $min_price)
@@ -186,24 +186,24 @@ class Product extends BaseLoop
                     ->where(array('not_in_promo_min_price', 'in_promo_min_price'), Criteria::LOGICAL_OR);
         }
 
-        $max_price = $this->getMax_price();
+        $max_price = $this->getMax_price();*/
 
-        if(null !== $max_price) {
+        //if(null !== $max_price) {
             /**
              * Following should work but does not :
              *
              *  $search->filterBy('real_price', $max_price, Criteria::LESS_EQUAL);
              */
-            $search->condition('in_promo', ProductTableMap::PROMO . Criteria::EQUAL . '1')
+            /*$search->condition('in_promo', ProductTableMap::PROMO . Criteria::EQUAL . '1')
                     ->condition('not_in_promo', ProductTableMap::PROMO . Criteria::NOT_EQUAL . '1')
                     ->condition('max_price2', ProductTableMap::PRICE2 . Criteria::LESS_EQUAL . '?', $max_price)
                     ->condition('max_price', ProductTableMap::PRICE . Criteria::LESS_EQUAL . '?', $max_price)
                     ->combine(array('in_promo', 'max_price2'), Criteria::LOGICAL_AND, 'in_promo_max_price')
                     ->combine(array('not_in_promo', 'max_price'), Criteria::LOGICAL_AND, 'not_in_promo_max_price')
                     ->where(array('not_in_promo_max_price', 'in_promo_max_price'), Criteria::LOGICAL_OR);
-        }
+        }*/
 
-        $min_weight = $this->getMin_weight();
+        /*$min_weight = $this->getMin_weight();
 
         if(null !== $min_weight) {
             $search->filterByWeight($min_weight, Criteria::GREATER_EQUAL);
@@ -213,7 +213,7 @@ class Product extends BaseLoop
 
         if(null !== $max_weight) {
             $search->filterByWeight($max_weight, Criteria::LESS_EQUAL);
-        }
+        }*/
 
         $current = $this->getCurrent();
 
@@ -264,12 +264,12 @@ class Product extends BaseLoop
                 case "alpha_reverse":
                     $search->addDescendingOrderByColumn(\Thelia\Model\Map\ProductI18nTableMap::TITLE);
                     break;
-                case "min_price":
+                /*case "min_price":
                     $search->orderBy('real_price', Criteria::ASC);
                     break;
                 case "max_price":
                     $search->orderBy('real_price', Criteria::DESC);
-                    break;
+                    break;*/
                 case "manual":
                     if(null === $this->category || count($this->category) != 1)
                         throw new \InvalidArgumentException('Manual order cannot be set without single category argument');
@@ -283,12 +283,12 @@ class Product extends BaseLoop
                 case "ref":
                     $search->orderByRef(Criteria::ASC);
                     break;
-                case "promo":
+                /*case "promo":
                     $search->orderByPromo(Criteria::DESC);
                     break;
                 case "new":
                     $search->orderByNewness(Criteria::DESC);
-                    break;
+                    break;*/
                 case "given_id":
                     if(null === $id)
                         throw new \InvalidArgumentException('Given_id order cannot be set without `id` argument');
@@ -328,7 +328,7 @@ class Product extends BaseLoop
                     $featureAlias = 'fa_' . $feature;
                     if($feature_av != '*')
                         $featureAlias .= '_' . $feature_av;
-                    $search->joinFeatureProd($featureAlias, Criteria::LEFT_JOIN)
+                    $search->joinFeatureProduct($featureAlias, Criteria::LEFT_JOIN)
                         ->addJoinCondition($featureAlias, "`$featureAlias`.FEATURE_ID = ?", $feature, null, \PDO::PARAM_INT);
                     if($feature_av != '*')
                         $search->addJoinCondition($featureAlias, "`$featureAlias`.FEATURE_AV_ID = ?", $feature_av, null, \PDO::PARAM_INT);
@@ -356,7 +356,7 @@ class Product extends BaseLoop
                     $featureAlias = 'fv_' . $feature;
                     if($feature_value != '*')
                         $featureAlias .= '_' . $feature_value;
-                    $search->joinFeatureProd($featureAlias, Criteria::LEFT_JOIN)
+                    $search->joinFeatureProduct($featureAlias, Criteria::LEFT_JOIN)
                         ->addJoinCondition($featureAlias, "`$featureAlias`.FEATURE_ID = ?", $feature, null, \PDO::PARAM_INT);
                     if($feature_value != '*')
                         $search->addJoinCondition($featureAlias, "`$featureAlias`.BY_DEFAULT = ?", $feature_value, null, \PDO::PARAM_STR);
@@ -401,11 +401,11 @@ class Product extends BaseLoop
             $loopResultRow->set("CHAPO", $product->getChapo());
             $loopResultRow->set("DESCRIPTION", $product->getDescription());
             $loopResultRow->set("POSTSCRIPTUM", $product->getPostscriptum());
-            $loopResultRow->set("PRICE", $product->getPrice());
+            //$loopResultRow->set("PRICE", $product->getPrice());
-            $loopResultRow->set("PROMO_PRICE", $product->getPrice2());
+            //$loopResultRow->set("PROMO_PRICE", $product->getPrice2());
-            $loopResultRow->set("WEIGHT", $product->getWeight());
+            //$loopResultRow->set("WEIGHT", $product->getWeight());
-            $loopResultRow->set("PROMO", $product->getPromo());
+            //$loopResultRow->set("PROMO", $product->getPromo());
-            $loopResultRow->set("NEW", $product->getNewness());
+            //$loopResultRow->set("NEW", $product->getNewness());
 
             $loopResult->addRow($loopResultRow);
         }

core/lib/Thelia/Core/Template/Loop/Title.php

@@ -91,9 +91,6 @@ class Title extends BaseLoop
         $loopResult = new LoopResult();
 
         foreach ($titles as $title) {
-
-            if ($this->not_empty && $title->countAllProducts() == 0) continue;
-
             $loopResultRow = new LoopResultRow();
             $loopResultRow->set("ID", $title->getId());
             $loopResultRow->set("DEFAULT", $title->getByDefault());

core/lib/Thelia/Model/Base/Attribute.php

@@ -1839,10 +1839,10 @@ abstract class Attribute implements ActiveRecordInterface
      * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
      * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects
      */
-    public function getAttributeCombinationsJoinCombination($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+    public function getAttributeCombinationsJoinStock($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
     {
         $query = ChildAttributeCombinationQuery::create(null, $criteria);
-        $query->joinWith('Combination', $joinBehavior);
+        $query->joinWith('Stock', $joinBehavior);
 
         return $this->getAttributeCombinations($query, $con);
     }

core/lib/Thelia/Model/Base/AttributeAv.php

@@ -1628,10 +1628,10 @@ abstract class AttributeAv implements ActiveRecordInterface
      * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
      * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects
      */
-    public function getAttributeCombinationsJoinCombination($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+    public function getAttributeCombinationsJoinStock($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
     {
         $query = ChildAttributeCombinationQuery::create(null, $criteria);
-        $query->joinWith('Combination', $joinBehavior);
+        $query->joinWith('Stock', $joinBehavior);
 
         return $this->getAttributeCombinations($query, $con);
     }

core/lib/Thelia/Model/Base/AttributeCombination.php

@@ -22,8 +22,8 @@ use Thelia\Model\AttributeAvQuery as ChildAttributeAvQuery;
 use Thelia\Model\AttributeCombination as ChildAttributeCombination;
 use Thelia\Model\AttributeCombinationQuery as ChildAttributeCombinationQuery;
 use Thelia\Model\AttributeQuery as ChildAttributeQuery;
-use Thelia\Model\Combination as ChildCombination;
+use Thelia\Model\Stock as ChildStock;
-use Thelia\Model\CombinationQuery as ChildCombinationQuery;
+use Thelia\Model\StockQuery as ChildStockQuery;
 use Thelia\Model\Map\AttributeCombinationTableMap;
 
 abstract class AttributeCombination implements ActiveRecordInterface
@@ -60,30 +60,24 @@ abstract class AttributeCombination implements ActiveRecordInterface
      */
     protected $virtualColumns = array();
 
-    /**
-     * The value for the id field.
-     * @var        int
-     */
-    protected $id;
-
     /**
      * The value for the attribute_id field.
      * @var        int
      */
     protected $attribute_id;
 
-    /**
-     * The value for the combination_id field.
-     * @var        int
-     */
-    protected $combination_id;
-
     /**
      * The value for the attribute_av_id field.
      * @var        int
      */
     protected $attribute_av_id;
 
+    /**
+     * The value for the stock_id field.
+     * @var        int
+     */
+    protected $stock_id;
+
     /**
      * The value for the created_at field.
      * @var        string
@@ -107,9 +101,9 @@ abstract class AttributeCombination implements ActiveRecordInterface
     protected $aAttributeAv;
 
     /**
-     * @var        Combination
+     * @var        Stock
      */
-    protected $aCombination;
+    protected $aStock;
 
     /**
      * Flag to prevent endless save loop, if this object is referenced
@@ -373,17 +367,6 @@ abstract class AttributeCombination implements ActiveRecordInterface
         return array_keys(get_object_vars($this));
     }
 
-    /**
-     * Get the [id] column value.
-     *
-     * @return   int
-     */
-    public function getId()
-    {
-
-        return $this->id;
-    }
-
     /**
      * Get the [attribute_id] column value.
      *
@@ -395,17 +378,6 @@ abstract class AttributeCombination implements ActiveRecordInterface
         return $this->attribute_id;
     }
 
-    /**
-     * Get the [combination_id] column value.
-     *
-     * @return   int
-     */
-    public function getCombinationId()
-    {
-
-        return $this->combination_id;
-    }
-
     /**
      * Get the [attribute_av_id] column value.
      *
@@ -417,6 +389,17 @@ abstract class AttributeCombination implements ActiveRecordInterface
         return $this->attribute_av_id;
     }
 
+    /**
+     * Get the [stock_id] column value.
+     *
+     * @return   int
+     */
+    public function getStockId()
+    {
+
+        return $this->stock_id;
+    }
+
     /**
      * Get the [optionally formatted] temporal [created_at] column value.
      *
@@ -457,27 +440,6 @@ abstract class AttributeCombination implements ActiveRecordInterface
         }
     }
 
-    /**
-     * Set the value of [id] column.
-     *
-     * @param      int $v new value
-     * @return   \Thelia\Model\AttributeCombination The current object (for fluent API support)
-     */
-    public function setId($v)
-    {
-        if ($v !== null) {
-            $v = (int) $v;
-        }
-
-        if ($this->id !== $v) {
-            $this->id = $v;
-            $this->modifiedColumns[] = AttributeCombinationTableMap::ID;
-        }
-
-
-        return $this;
-    } // setId()
-
     /**
      * Set the value of [attribute_id] column.
      *
@@ -503,31 +465,6 @@ abstract class AttributeCombination implements ActiveRecordInterface
         return $this;
     } // setAttributeId()
 
-    /**
-     * Set the value of [combination_id] column.
-     *
-     * @param      int $v new value
-     * @return   \Thelia\Model\AttributeCombination The current object (for fluent API support)
-     */
-    public function setCombinationId($v)
-    {
-        if ($v !== null) {
-            $v = (int) $v;
-        }
-
-        if ($this->combination_id !== $v) {
-            $this->combination_id = $v;
-            $this->modifiedColumns[] = AttributeCombinationTableMap::COMBINATION_ID;
-        }
-
-        if ($this->aCombination !== null && $this->aCombination->getId() !== $v) {
-            $this->aCombination = null;
-        }
-
-
-        return $this;
-    } // setCombinationId()
-
     /**
      * Set the value of [attribute_av_id] column.
      *
@@ -553,6 +490,31 @@ abstract class AttributeCombination implements ActiveRecordInterface
         return $this;
     } // setAttributeAvId()
 
+    /**
+     * Set the value of [stock_id] column.
+     *
+     * @param      int $v new value
+     * @return   \Thelia\Model\AttributeCombination The current object (for fluent API support)
+     */
+    public function setStockId($v)
+    {
+        if ($v !== null) {
+            $v = (int) $v;
+        }
+
+        if ($this->stock_id !== $v) {
+            $this->stock_id = $v;
+            $this->modifiedColumns[] = AttributeCombinationTableMap::STOCK_ID;
+        }
+
+        if ($this->aStock !== null && $this->aStock->getId() !== $v) {
+            $this->aStock = null;
+        }
+
+
+        return $this;
+    } // setStockId()
+
     /**
      * Sets the value of [created_at] column to a normalized version of the date/time value specified.
      *
@@ -632,25 +594,22 @@ abstract class AttributeCombination implements ActiveRecordInterface
         try {
 
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : AttributeCombinationTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : AttributeCombinationTableMap::translateFieldName('AttributeId', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->id = (null !== $col) ? (int) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : AttributeCombinationTableMap::translateFieldName('AttributeId', TableMap::TYPE_PHPNAME, $indexType)];
             $this->attribute_id = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : AttributeCombinationTableMap::translateFieldName('CombinationId', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : AttributeCombinationTableMap::translateFieldName('AttributeAvId', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->combination_id = (null !== $col) ? (int) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : AttributeCombinationTableMap::translateFieldName('AttributeAvId', TableMap::TYPE_PHPNAME, $indexType)];
             $this->attribute_av_id = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : AttributeCombinationTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : AttributeCombinationTableMap::translateFieldName('StockId', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->stock_id = (null !== $col) ? (int) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : AttributeCombinationTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
             $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : AttributeCombinationTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : AttributeCombinationTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
@@ -663,7 +622,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
                 $this->ensureConsistency();
             }
 
-            return $startcol + 6; // 6 = AttributeCombinationTableMap::NUM_HYDRATE_COLUMNS.
+            return $startcol + 5; // 5 = AttributeCombinationTableMap::NUM_HYDRATE_COLUMNS.
 
         } catch (Exception $e) {
             throw new PropelException("Error populating \Thelia\Model\AttributeCombination object", 0, $e);
@@ -688,12 +647,12 @@ abstract class AttributeCombination implements ActiveRecordInterface
         if ($this->aAttribute !== null && $this->attribute_id !== $this->aAttribute->getId()) {
             $this->aAttribute = null;
         }
-        if ($this->aCombination !== null && $this->combination_id !== $this->aCombination->getId()) {
-            $this->aCombination = null;
-        }
         if ($this->aAttributeAv !== null && $this->attribute_av_id !== $this->aAttributeAv->getId()) {
             $this->aAttributeAv = null;
         }
+        if ($this->aStock !== null && $this->stock_id !== $this->aStock->getId()) {
+            $this->aStock = null;
+        }
     } // ensureConsistency
 
     /**
@@ -735,7 +694,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
 
             $this->aAttribute = null;
             $this->aAttributeAv = null;
-            $this->aCombination = null;
+            $this->aStock = null;
         } // if (deep)
     }
 
@@ -877,11 +836,11 @@ abstract class AttributeCombination implements ActiveRecordInterface
                 $this->setAttributeAv($this->aAttributeAv);
             }
 
-            if ($this->aCombination !== null) {
+            if ($this->aStock !== null) {
-                if ($this->aCombination->isModified() || $this->aCombination->isNew()) {
+                if ($this->aStock->isModified() || $this->aStock->isNew()) {
-                    $affectedRows += $this->aCombination->save($con);
+                    $affectedRows += $this->aStock->save($con);
                 }
-                $this->setCombination($this->aCombination);
+                $this->setStock($this->aStock);
             }
 
             if ($this->isNew() || $this->isModified()) {
@@ -915,24 +874,17 @@ abstract class AttributeCombination implements ActiveRecordInterface
         $modifiedColumns = array();
         $index = 0;
 
-        $this->modifiedColumns[] = AttributeCombinationTableMap::ID;
-        if (null !== $this->id) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key (' . AttributeCombinationTableMap::ID . ')');
-        }
 
          // check the columns in natural order for more readable SQL queries
-        if ($this->isColumnModified(AttributeCombinationTableMap::ID)) {
-            $modifiedColumns[':p' . $index++]  = 'ID';
-        }
         if ($this->isColumnModified(AttributeCombinationTableMap::ATTRIBUTE_ID)) {
             $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_ID';
         }
-        if ($this->isColumnModified(AttributeCombinationTableMap::COMBINATION_ID)) {
-            $modifiedColumns[':p' . $index++]  = 'COMBINATION_ID';
-        }
         if ($this->isColumnModified(AttributeCombinationTableMap::ATTRIBUTE_AV_ID)) {
             $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_AV_ID';
         }
+        if ($this->isColumnModified(AttributeCombinationTableMap::STOCK_ID)) {
+            $modifiedColumns[':p' . $index++]  = 'STOCK_ID';
+        }
         if ($this->isColumnModified(AttributeCombinationTableMap::CREATED_AT)) {
             $modifiedColumns[':p' . $index++]  = 'CREATED_AT';
         }
@@ -950,18 +902,15 @@ abstract class AttributeCombination implements ActiveRecordInterface
             $stmt = $con->prepare($sql);
             foreach ($modifiedColumns as $identifier => $columnName) {
                 switch ($columnName) {
-                    case 'ID':
-                        $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
-                        break;
                     case 'ATTRIBUTE_ID':
                         $stmt->bindValue($identifier, $this->attribute_id, PDO::PARAM_INT);
                         break;
-                    case 'COMBINATION_ID':
-                        $stmt->bindValue($identifier, $this->combination_id, PDO::PARAM_INT);
-                        break;
                     case 'ATTRIBUTE_AV_ID':
                         $stmt->bindValue($identifier, $this->attribute_av_id, PDO::PARAM_INT);
                         break;
+                    case 'STOCK_ID':
+                        $stmt->bindValue($identifier, $this->stock_id, PDO::PARAM_INT);
+                        break;
                     case 'CREATED_AT':
                         $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
                         break;
@@ -976,13 +925,6 @@ abstract class AttributeCombination implements ActiveRecordInterface
             throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e);
         }
 
-        try {
-            $pk = $con->lastInsertId();
-        } catch (Exception $e) {
-            throw new PropelException('Unable to get autoincrement id.', 0, $e);
-        }
-        $this->setId($pk);
-
         $this->setNew(false);
     }
 
@@ -1031,21 +973,18 @@ abstract class AttributeCombination implements ActiveRecordInterface
     {
         switch ($pos) {
             case 0:
-                return $this->getId();
-                break;
-            case 1:
                 return $this->getAttributeId();
                 break;
-            case 2:
+            case 1:
-                return $this->getCombinationId();
-                break;
-            case 3:
                 return $this->getAttributeAvId();
                 break;
-            case 4:
+            case 2:
+                return $this->getStockId();
+                break;
+            case 3:
                 return $this->getCreatedAt();
                 break;
-            case 5:
+            case 4:
                 return $this->getUpdatedAt();
                 break;
             default:
@@ -1077,12 +1016,11 @@ abstract class AttributeCombination implements ActiveRecordInterface
         $alreadyDumpedObjects['AttributeCombination'][serialize($this->getPrimaryKey())] = true;
         $keys = AttributeCombinationTableMap::getFieldNames($keyType);
         $result = array(
-            $keys[0] => $this->getId(),
+            $keys[0] => $this->getAttributeId(),
-            $keys[1] => $this->getAttributeId(),
+            $keys[1] => $this->getAttributeAvId(),
-            $keys[2] => $this->getCombinationId(),
+            $keys[2] => $this->getStockId(),
-            $keys[3] => $this->getAttributeAvId(),
+            $keys[3] => $this->getCreatedAt(),
-            $keys[4] => $this->getCreatedAt(),
+            $keys[4] => $this->getUpdatedAt(),
-            $keys[5] => $this->getUpdatedAt(),
         );
         $virtualColumns = $this->virtualColumns;
         foreach($virtualColumns as $key => $virtualColumn)
@@ -1097,8 +1035,8 @@ abstract class AttributeCombination implements ActiveRecordInterface
             if (null !== $this->aAttributeAv) {
                 $result['AttributeAv'] = $this->aAttributeAv->toArray($keyType, $includeLazyLoadColumns,  $alreadyDumpedObjects, true);
             }
-            if (null !== $this->aCombination) {
+            if (null !== $this->aStock) {
-                $result['Combination'] = $this->aCombination->toArray($keyType, $includeLazyLoadColumns,  $alreadyDumpedObjects, true);
+                $result['Stock'] = $this->aStock->toArray($keyType, $includeLazyLoadColumns,  $alreadyDumpedObjects, true);
             }
         }
 
@@ -1135,21 +1073,18 @@ abstract class AttributeCombination implements ActiveRecordInterface
     {
         switch ($pos) {
             case 0:
-                $this->setId($value);
-                break;
-            case 1:
                 $this->setAttributeId($value);
                 break;
-            case 2:
+            case 1:
-                $this->setCombinationId($value);
-                break;
-            case 3:
                 $this->setAttributeAvId($value);
                 break;
-            case 4:
+            case 2:
+                $this->setStockId($value);
+                break;
+            case 3:
                 $this->setCreatedAt($value);
                 break;
-            case 5:
+            case 4:
                 $this->setUpdatedAt($value);
                 break;
         } // switch()
@@ -1176,12 +1111,11 @@ abstract class AttributeCombination implements ActiveRecordInterface
     {
         $keys = AttributeCombinationTableMap::getFieldNames($keyType);
 
-        if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
+        if (array_key_exists($keys[0], $arr)) $this->setAttributeId($arr[$keys[0]]);
-        if (array_key_exists($keys[1], $arr)) $this->setAttributeId($arr[$keys[1]]);
+        if (array_key_exists($keys[1], $arr)) $this->setAttributeAvId($arr[$keys[1]]);
-        if (array_key_exists($keys[2], $arr)) $this->setCombinationId($arr[$keys[2]]);
+        if (array_key_exists($keys[2], $arr)) $this->setStockId($arr[$keys[2]]);
-        if (array_key_exists($keys[3], $arr)) $this->setAttributeAvId($arr[$keys[3]]);
+        if (array_key_exists($keys[3], $arr)) $this->setCreatedAt($arr[$keys[3]]);
-        if (array_key_exists($keys[4], $arr)) $this->setCreatedAt($arr[$keys[4]]);
+        if (array_key_exists($keys[4], $arr)) $this->setUpdatedAt($arr[$keys[4]]);
-        if (array_key_exists($keys[5], $arr)) $this->setUpdatedAt($arr[$keys[5]]);
     }
 
     /**
@@ -1193,10 +1127,9 @@ abstract class AttributeCombination implements ActiveRecordInterface
     {
         $criteria = new Criteria(AttributeCombinationTableMap::DATABASE_NAME);
 
-        if ($this->isColumnModified(AttributeCombinationTableMap::ID)) $criteria->add(AttributeCombinationTableMap::ID, $this->id);
         if ($this->isColumnModified(AttributeCombinationTableMap::ATTRIBUTE_ID)) $criteria->add(AttributeCombinationTableMap::ATTRIBUTE_ID, $this->attribute_id);
-        if ($this->isColumnModified(AttributeCombinationTableMap::COMBINATION_ID)) $criteria->add(AttributeCombinationTableMap::COMBINATION_ID, $this->combination_id);
         if ($this->isColumnModified(AttributeCombinationTableMap::ATTRIBUTE_AV_ID)) $criteria->add(AttributeCombinationTableMap::ATTRIBUTE_AV_ID, $this->attribute_av_id);
+        if ($this->isColumnModified(AttributeCombinationTableMap::STOCK_ID)) $criteria->add(AttributeCombinationTableMap::STOCK_ID, $this->stock_id);
         if ($this->isColumnModified(AttributeCombinationTableMap::CREATED_AT)) $criteria->add(AttributeCombinationTableMap::CREATED_AT, $this->created_at);
         if ($this->isColumnModified(AttributeCombinationTableMap::UPDATED_AT)) $criteria->add(AttributeCombinationTableMap::UPDATED_AT, $this->updated_at);
 
@@ -1214,10 +1147,9 @@ abstract class AttributeCombination implements ActiveRecordInterface
     public function buildPkeyCriteria()
     {
         $criteria = new Criteria(AttributeCombinationTableMap::DATABASE_NAME);
-        $criteria->add(AttributeCombinationTableMap::ID, $this->id);
         $criteria->add(AttributeCombinationTableMap::ATTRIBUTE_ID, $this->attribute_id);
-        $criteria->add(AttributeCombinationTableMap::COMBINATION_ID, $this->combination_id);
         $criteria->add(AttributeCombinationTableMap::ATTRIBUTE_AV_ID, $this->attribute_av_id);
+        $criteria->add(AttributeCombinationTableMap::STOCK_ID, $this->stock_id);
 
         return $criteria;
     }
@@ -1230,10 +1162,9 @@ abstract class AttributeCombination implements ActiveRecordInterface
     public function getPrimaryKey()
     {
         $pks = array();
-        $pks[0] = $this->getId();
+        $pks[0] = $this->getAttributeId();
-        $pks[1] = $this->getAttributeId();
+        $pks[1] = $this->getAttributeAvId();
-        $pks[2] = $this->getCombinationId();
+        $pks[2] = $this->getStockId();
-        $pks[3] = $this->getAttributeAvId();
 
         return $pks;
     }
@@ -1246,10 +1177,9 @@ abstract class AttributeCombination implements ActiveRecordInterface
      */
     public function setPrimaryKey($keys)
     {
-        $this->setId($keys[0]);
+        $this->setAttributeId($keys[0]);
-        $this->setAttributeId($keys[1]);
+        $this->setAttributeAvId($keys[1]);
-        $this->setCombinationId($keys[2]);
+        $this->setStockId($keys[2]);
-        $this->setAttributeAvId($keys[3]);
     }
 
     /**
@@ -1259,7 +1189,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
     public function isPrimaryKeyNull()
     {
 
-        return (null === $this->getId()) && (null === $this->getAttributeId()) && (null === $this->getCombinationId()) && (null === $this->getAttributeAvId());
+        return (null === $this->getAttributeId()) && (null === $this->getAttributeAvId()) && (null === $this->getStockId());
     }
 
     /**
@@ -1276,13 +1206,12 @@ abstract class AttributeCombination implements ActiveRecordInterface
     public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
     {
         $copyObj->setAttributeId($this->getAttributeId());
-        $copyObj->setCombinationId($this->getCombinationId());
         $copyObj->setAttributeAvId($this->getAttributeAvId());
+        $copyObj->setStockId($this->getStockId());
         $copyObj->setCreatedAt($this->getCreatedAt());
         $copyObj->setUpdatedAt($this->getUpdatedAt());
         if ($makeNew) {
             $copyObj->setNew(true);
-            $copyObj->setId(NULL); // this is a auto-increment column, so set to default value
         }
     }
 
@@ -1411,24 +1340,24 @@ abstract class AttributeCombination implements ActiveRecordInterface
     }
 
     /**
-     * Declares an association between this object and a ChildCombination object.
+     * Declares an association between this object and a ChildStock object.
      *
-     * @param                  ChildCombination $v
+     * @param                  ChildStock $v
      * @return                 \Thelia\Model\AttributeCombination The current object (for fluent API support)
      * @throws PropelException
      */
-    public function setCombination(ChildCombination $v = null)
+    public function setStock(ChildStock $v = null)
     {
         if ($v === null) {
-            $this->setCombinationId(NULL);
+            $this->setStockId(NULL);
         } else {
-            $this->setCombinationId($v->getId());
+            $this->setStockId($v->getId());
         }
 
-        $this->aCombination = $v;
+        $this->aStock = $v;
 
         // Add binding for other direction of this n:n relationship.
-        // If this object has already been added to the ChildCombination object, it will not be re-added.
+        // If this object has already been added to the ChildStock object, it will not be re-added.
         if ($v !== null) {
             $v->addAttributeCombination($this);
         }
@@ -1439,26 +1368,26 @@ abstract class AttributeCombination implements ActiveRecordInterface
 
 
     /**
-     * Get the associated ChildCombination object
+     * Get the associated ChildStock object
      *
      * @param      ConnectionInterface $con Optional Connection object.
-     * @return                 ChildCombination The associated ChildCombination object.
+     * @return                 ChildStock The associated ChildStock object.
      * @throws PropelException
      */
-    public function getCombination(ConnectionInterface $con = null)
+    public function getStock(ConnectionInterface $con = null)
     {
-        if ($this->aCombination === null && ($this->combination_id !== null)) {
+        if ($this->aStock === null && ($this->stock_id !== null)) {
-            $this->aCombination = ChildCombinationQuery::create()->findPk($this->combination_id, $con);
+            $this->aStock = ChildStockQuery::create()->findPk($this->stock_id, $con);
             /* The following can be used additionally to
                 guarantee the related object contains a reference
                 to this object.  This level of coupling may, however, be
                 undesirable since it could result in an only partially populated collection
                 in the referenced object.
-                $this->aCombination->addAttributeCombinations($this);
+                $this->aStock->addAttributeCombinations($this);
              */
         }
 
-        return $this->aCombination;
+        return $this->aStock;
     }
 
     /**
@@ -1466,10 +1395,9 @@ abstract class AttributeCombination implements ActiveRecordInterface
      */
     public function clear()
     {
-        $this->id = null;
         $this->attribute_id = null;
-        $this->combination_id = null;
         $this->attribute_av_id = null;
+        $this->stock_id = null;
         $this->created_at = null;
         $this->updated_at = null;
         $this->alreadyInSave = false;
@@ -1495,7 +1423,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
 
         $this->aAttribute = null;
         $this->aAttributeAv = null;
-        $this->aCombination = null;
+        $this->aStock = null;
     }
 
     /**

core/lib/Thelia/Model/Base/AttributeCombinationQuery.php

@@ -21,17 +21,15 @@ use Thelia\Model\Map\AttributeCombinationTableMap;
  *
  *
  *
- * @method     ChildAttributeCombinationQuery orderById($order = Criteria::ASC) Order by the id column
  * @method     ChildAttributeCombinationQuery orderByAttributeId($order = Criteria::ASC) Order by the attribute_id column
- * @method     ChildAttributeCombinationQuery orderByCombinationId($order = Criteria::ASC) Order by the combination_id column
  * @method     ChildAttributeCombinationQuery orderByAttributeAvId($order = Criteria::ASC) Order by the attribute_av_id column
+ * @method     ChildAttributeCombinationQuery orderByStockId($order = Criteria::ASC) Order by the stock_id column
  * @method     ChildAttributeCombinationQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
  * @method     ChildAttributeCombinationQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
  *
- * @method     ChildAttributeCombinationQuery groupById() Group by the id column
  * @method     ChildAttributeCombinationQuery groupByAttributeId() Group by the attribute_id column
- * @method     ChildAttributeCombinationQuery groupByCombinationId() Group by the combination_id column
  * @method     ChildAttributeCombinationQuery groupByAttributeAvId() Group by the attribute_av_id column
+ * @method     ChildAttributeCombinationQuery groupByStockId() Group by the stock_id column
  * @method     ChildAttributeCombinationQuery groupByCreatedAt() Group by the created_at column
  * @method     ChildAttributeCombinationQuery groupByUpdatedAt() Group by the updated_at column
  *
@@ -47,24 +45,22 @@ use Thelia\Model\Map\AttributeCombinationTableMap;
  * @method     ChildAttributeCombinationQuery rightJoinAttributeAv($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AttributeAv relation
  * @method     ChildAttributeCombinationQuery innerJoinAttributeAv($relationAlias = null) Adds a INNER JOIN clause to the query using the AttributeAv relation
  *
- * @method     ChildAttributeCombinationQuery leftJoinCombination($relationAlias = null) Adds a LEFT JOIN clause to the query using the Combination relation
+ * @method     ChildAttributeCombinationQuery leftJoinStock($relationAlias = null) Adds a LEFT JOIN clause to the query using the Stock relation
- * @method     ChildAttributeCombinationQuery rightJoinCombination($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Combination relation
+ * @method     ChildAttributeCombinationQuery rightJoinStock($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Stock relation
- * @method     ChildAttributeCombinationQuery innerJoinCombination($relationAlias = null) Adds a INNER JOIN clause to the query using the Combination relation
+ * @method     ChildAttributeCombinationQuery innerJoinStock($relationAlias = null) Adds a INNER JOIN clause to the query using the Stock relation
  *
  * @method     ChildAttributeCombination findOne(ConnectionInterface $con = null) Return the first ChildAttributeCombination matching the query
  * @method     ChildAttributeCombination findOneOrCreate(ConnectionInterface $con = null) Return the first ChildAttributeCombination matching the query, or a new ChildAttributeCombination object populated from the query conditions when no match is found
  *
- * @method     ChildAttributeCombination findOneById(int $id) Return the first ChildAttributeCombination filtered by the id column
  * @method     ChildAttributeCombination findOneByAttributeId(int $attribute_id) Return the first ChildAttributeCombination filtered by the attribute_id column
- * @method     ChildAttributeCombination findOneByCombinationId(int $combination_id) Return the first ChildAttributeCombination filtered by the combination_id column
  * @method     ChildAttributeCombination findOneByAttributeAvId(int $attribute_av_id) Return the first ChildAttributeCombination filtered by the attribute_av_id column
+ * @method     ChildAttributeCombination findOneByStockId(int $stock_id) Return the first ChildAttributeCombination filtered by the stock_id column
  * @method     ChildAttributeCombination findOneByCreatedAt(string $created_at) Return the first ChildAttributeCombination filtered by the created_at column
  * @method     ChildAttributeCombination findOneByUpdatedAt(string $updated_at) Return the first ChildAttributeCombination filtered by the updated_at column
  *
- * @method     array findById(int $id) Return ChildAttributeCombination objects filtered by the id column
  * @method     array findByAttributeId(int $attribute_id) Return ChildAttributeCombination objects filtered by the attribute_id column
- * @method     array findByCombinationId(int $combination_id) Return ChildAttributeCombination objects filtered by the combination_id column
  * @method     array findByAttributeAvId(int $attribute_av_id) Return ChildAttributeCombination objects filtered by the attribute_av_id column
+ * @method     array findByStockId(int $stock_id) Return ChildAttributeCombination objects filtered by the stock_id column
  * @method     array findByCreatedAt(string $created_at) Return ChildAttributeCombination objects filtered by the created_at column
  * @method     array findByUpdatedAt(string $updated_at) Return ChildAttributeCombination objects filtered by the updated_at column
  *
@@ -114,10 +110,10 @@ abstract class AttributeCombinationQuery extends ModelCriteria
      * Go fast if the query is untouched.
      *
      * <code>
-     * $obj = $c->findPk(array(12, 34, 56, 78), $con);
+     * $obj = $c->findPk(array(12, 34, 56), $con);
      * </code>
      *
-     * @param array[$id, $attribute_id, $combination_id, $attribute_av_id] $key Primary key to use for the query
+     * @param array[$attribute_id, $attribute_av_id, $stock_id] $key Primary key to use for the query
      * @param ConnectionInterface $con an optional connection object
      *
      * @return ChildAttributeCombination|array|mixed the result, formatted by the current formatter
@@ -127,7 +123,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria
         if ($key === null) {
             return null;
         }
-        if ((null !== ($obj = AttributeCombinationTableMap::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1], (string) $key[2], (string) $key[3]))))) && !$this->formatter) {
+        if ((null !== ($obj = AttributeCombinationTableMap::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1], (string) $key[2]))))) && !$this->formatter) {
             // the object is already in the instance pool
             return $obj;
         }
@@ -155,13 +151,12 @@ abstract class AttributeCombinationQuery extends ModelCriteria
      */
     protected function findPkSimple($key, $con)
     {
-        $sql = 'SELECT ID, ATTRIBUTE_ID, COMBINATION_ID, ATTRIBUTE_AV_ID, CREATED_AT, UPDATED_AT FROM attribute_combination WHERE ID = :p0 AND ATTRIBUTE_ID = :p1 AND COMBINATION_ID = :p2 AND ATTRIBUTE_AV_ID = :p3';
+        $sql = 'SELECT ATTRIBUTE_ID, ATTRIBUTE_AV_ID, STOCK_ID, CREATED_AT, UPDATED_AT FROM attribute_combination WHERE ATTRIBUTE_ID = :p0 AND ATTRIBUTE_AV_ID = :p1 AND STOCK_ID = :p2';
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT);
             $stmt->bindValue(':p1', $key[1], PDO::PARAM_INT);
             $stmt->bindValue(':p2', $key[2], PDO::PARAM_INT);
-            $stmt->bindValue(':p3', $key[3], PDO::PARAM_INT);
             $stmt->execute();
         } catch (Exception $e) {
             Propel::log($e->getMessage(), Propel::LOG_ERR);
@@ -171,7 +166,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria
         if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
             $obj = new ChildAttributeCombination();
             $obj->hydrate($row);
-            AttributeCombinationTableMap::addInstanceToPool($obj, serialize(array((string) $key[0], (string) $key[1], (string) $key[2], (string) $key[3])));
+            AttributeCombinationTableMap::addInstanceToPool($obj, serialize(array((string) $key[0], (string) $key[1], (string) $key[2])));
         }
         $stmt->closeCursor();
 
@@ -230,10 +225,9 @@ abstract class AttributeCombinationQuery extends ModelCriteria
      */
     public function filterByPrimaryKey($key)
     {
-        $this->addUsingAlias(AttributeCombinationTableMap::ID, $key[0], Criteria::EQUAL);
+        $this->addUsingAlias(AttributeCombinationTableMap::ATTRIBUTE_ID, $key[0], Criteria::EQUAL);
-        $this->addUsingAlias(AttributeCombinationTableMap::ATTRIBUTE_ID, $key[1], Criteria::EQUAL);
+        $this->addUsingAlias(AttributeCombinationTableMap::ATTRIBUTE_AV_ID, $key[1], Criteria::EQUAL);
-        $this->addUsingAlias(AttributeCombinationTableMap::COMBINATION_ID, $key[2], Criteria::EQUAL);
+        $this->addUsingAlias(AttributeCombinationTableMap::STOCK_ID, $key[2], Criteria::EQUAL);
-        $this->addUsingAlias(AttributeCombinationTableMap::ATTRIBUTE_AV_ID, $key[3], Criteria::EQUAL);
 
         return $this;
     }
@@ -251,60 +245,17 @@ abstract class AttributeCombinationQuery extends ModelCriteria
             return $this->add(null, '1<>1', Criteria::CUSTOM);
         }
         foreach ($keys as $key) {
-            $cton0 = $this->getNewCriterion(AttributeCombinationTableMap::ID, $key[0], Criteria::EQUAL);
+            $cton0 = $this->getNewCriterion(AttributeCombinationTableMap::ATTRIBUTE_ID, $key[0], Criteria::EQUAL);
-            $cton1 = $this->getNewCriterion(AttributeCombinationTableMap::ATTRIBUTE_ID, $key[1], Criteria::EQUAL);
+            $cton1 = $this->getNewCriterion(AttributeCombinationTableMap::ATTRIBUTE_AV_ID, $key[1], Criteria::EQUAL);
             $cton0->addAnd($cton1);
-            $cton2 = $this->getNewCriterion(AttributeCombinationTableMap::COMBINATION_ID, $key[2], Criteria::EQUAL);
+            $cton2 = $this->getNewCriterion(AttributeCombinationTableMap::STOCK_ID, $key[2], Criteria::EQUAL);
             $cton0->addAnd($cton2);
-            $cton3 = $this->getNewCriterion(AttributeCombinationTableMap::ATTRIBUTE_AV_ID, $key[3], Criteria::EQUAL);
-            $cton0->addAnd($cton3);
             $this->addOr($cton0);
         }
 
         return $this;
     }
 
-    /**
-     * Filter the query on the id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterById(1234); // WHERE id = 1234
-     * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
-     * $query->filterById(array('min' => 12)); // WHERE id > 12
-     * </code>
-     *
-     * @param     mixed $id The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function filterById($id = null, $comparison = null)
-    {
-        if (is_array($id)) {
-            $useMinMax = false;
-            if (isset($id['min'])) {
-                $this->addUsingAlias(AttributeCombinationTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($id['max'])) {
-                $this->addUsingAlias(AttributeCombinationTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(AttributeCombinationTableMap::ID, $id, $comparison);
-    }
-
     /**
      * Filter the query on the attribute_id column
      *
@@ -348,49 +299,6 @@ abstract class AttributeCombinationQuery extends ModelCriteria
         return $this->addUsingAlias(AttributeCombinationTableMap::ATTRIBUTE_ID, $attributeId, $comparison);
     }
 
-    /**
-     * Filter the query on the combination_id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByCombinationId(1234); // WHERE combination_id = 1234
-     * $query->filterByCombinationId(array(12, 34)); // WHERE combination_id IN (12, 34)
-     * $query->filterByCombinationId(array('min' => 12)); // WHERE combination_id > 12
-     * </code>
-     *
-     * @see       filterByCombination()
-     *
-     * @param     mixed $combinationId The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function filterByCombinationId($combinationId = null, $comparison = null)
-    {
-        if (is_array($combinationId)) {
-            $useMinMax = false;
-            if (isset($combinationId['min'])) {
-                $this->addUsingAlias(AttributeCombinationTableMap::COMBINATION_ID, $combinationId['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($combinationId['max'])) {
-                $this->addUsingAlias(AttributeCombinationTableMap::COMBINATION_ID, $combinationId['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(AttributeCombinationTableMap::COMBINATION_ID, $combinationId, $comparison);
-    }
-
     /**
      * Filter the query on the attribute_av_id column
      *
@@ -434,6 +342,49 @@ abstract class AttributeCombinationQuery extends ModelCriteria
         return $this->addUsingAlias(AttributeCombinationTableMap::ATTRIBUTE_AV_ID, $attributeAvId, $comparison);
     }
 
+    /**
+     * Filter the query on the stock_id column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByStockId(1234); // WHERE stock_id = 1234
+     * $query->filterByStockId(array(12, 34)); // WHERE stock_id IN (12, 34)
+     * $query->filterByStockId(array('min' => 12)); // WHERE stock_id > 12
+     * </code>
+     *
+     * @see       filterByStock()
+     *
+     * @param     mixed $stockId The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByStockId($stockId = null, $comparison = null)
+    {
+        if (is_array($stockId)) {
+            $useMinMax = false;
+            if (isset($stockId['min'])) {
+                $this->addUsingAlias(AttributeCombinationTableMap::STOCK_ID, $stockId['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($stockId['max'])) {
+                $this->addUsingAlias(AttributeCombinationTableMap::STOCK_ID, $stockId['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(AttributeCombinationTableMap::STOCK_ID, $stockId, $comparison);
+    }
+
     /**
      * Filter the query on the created_at column
      *
@@ -671,42 +622,42 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     }
 
     /**
-     * Filter the query by a related \Thelia\Model\Combination object
+     * Filter the query by a related \Thelia\Model\Stock object
      *
-     * @param \Thelia\Model\Combination|ObjectCollection $combination The related object(s) to use as filter
+     * @param \Thelia\Model\Stock|ObjectCollection $stock The related object(s) to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeCombinationQuery The current query, for fluid interface
      */
-    public function filterByCombination($combination, $comparison = null)
+    public function filterByStock($stock, $comparison = null)
     {
-        if ($combination instanceof \Thelia\Model\Combination) {
+        if ($stock instanceof \Thelia\Model\Stock) {
             return $this
-                ->addUsingAlias(AttributeCombinationTableMap::COMBINATION_ID, $combination->getId(), $comparison);
+                ->addUsingAlias(AttributeCombinationTableMap::STOCK_ID, $stock->getId(), $comparison);
-        } elseif ($combination instanceof ObjectCollection) {
+        } elseif ($stock instanceof ObjectCollection) {
             if (null === $comparison) {
                 $comparison = Criteria::IN;
             }
 
             return $this
-                ->addUsingAlias(AttributeCombinationTableMap::COMBINATION_ID, $combination->toKeyValue('PrimaryKey', 'Id'), $comparison);
+                ->addUsingAlias(AttributeCombinationTableMap::STOCK_ID, $stock->toKeyValue('PrimaryKey', 'Id'), $comparison);
         } else {
-            throw new PropelException('filterByCombination() only accepts arguments of type \Thelia\Model\Combination or Collection');
+            throw new PropelException('filterByStock() only accepts arguments of type \Thelia\Model\Stock or Collection');
         }
     }
 
     /**
-     * Adds a JOIN clause to the query using the Combination relation
+     * Adds a JOIN clause to the query using the Stock relation
      *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAttributeCombinationQuery The current query, for fluid interface
      */
-    public function joinCombination($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function joinStock($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
         $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('Combination');
+        $relationMap = $tableMap->getRelation('Stock');
 
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -721,14 +672,14 @@ abstract class AttributeCombinationQuery extends ModelCriteria
             $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
             $this->addJoinObject($join, $relationAlias);
         } else {
-            $this->addJoinObject($join, 'Combination');
+            $this->addJoinObject($join, 'Stock');
         }
 
         return $this;
     }
 
     /**
-     * Use the Combination relation Combination object
+     * Use the Stock relation Stock object
      *
      * @see useQuery()
      *
@@ -736,13 +687,13 @@ abstract class AttributeCombinationQuery extends ModelCriteria
      *                                   to be used as main alias in the secondary query
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return   \Thelia\Model\CombinationQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\StockQuery A secondary query class using the current class as primary query
      */
-    public function useCombinationQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function useStockQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
         return $this
-            ->joinCombination($relationAlias, $joinType)
+            ->joinStock($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'Combination', '\Thelia\Model\CombinationQuery');
+            ->useQuery($relationAlias ? $relationAlias : 'Stock', '\Thelia\Model\StockQuery');
     }
 
     /**
@@ -755,11 +706,10 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     public function prune($attributeCombination = null)
     {
         if ($attributeCombination) {
-            $this->addCond('pruneCond0', $this->getAliasedColName(AttributeCombinationTableMap::ID), $attributeCombination->getId(), Criteria::NOT_EQUAL);
+            $this->addCond('pruneCond0', $this->getAliasedColName(AttributeCombinationTableMap::ATTRIBUTE_ID), $attributeCombination->getAttributeId(), Criteria::NOT_EQUAL);
-            $this->addCond('pruneCond1', $this->getAliasedColName(AttributeCombinationTableMap::ATTRIBUTE_ID), $attributeCombination->getAttributeId(), Criteria::NOT_EQUAL);
+            $this->addCond('pruneCond1', $this->getAliasedColName(AttributeCombinationTableMap::ATTRIBUTE_AV_ID), $attributeCombination->getAttributeAvId(), Criteria::NOT_EQUAL);
-            $this->addCond('pruneCond2', $this->getAliasedColName(AttributeCombinationTableMap::COMBINATION_ID), $attributeCombination->getCombinationId(), Criteria::NOT_EQUAL);
+            $this->addCond('pruneCond2', $this->getAliasedColName(AttributeCombinationTableMap::STOCK_ID), $attributeCombination->getStockId(), Criteria::NOT_EQUAL);
-            $this->addCond('pruneCond3', $this->getAliasedColName(AttributeCombinationTableMap::ATTRIBUTE_AV_ID), $attributeCombination->getAttributeAvId(), Criteria::NOT_EQUAL);
+            $this->combine(array('pruneCond0', 'pruneCond1', 'pruneCond2'), Criteria::LOGICAL_OR);
-            $this->combine(array('pruneCond0', 'pruneCond1', 'pruneCond2', 'pruneCond3'), Criteria::LOGICAL_OR);
         }
 
         return $this;

core/lib/Thelia/Model/Base/Cart.php

@@ -1963,10 +1963,10 @@ abstract class Cart implements ActiveRecordInterface
      * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
      * @return Collection|ChildCartItem[] List of ChildCartItem objects
      */
-    public function getCartItemsJoinCombination($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+    public function getCartItemsJoinStock($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
     {
         $query = ChildCartItemQuery::create(null, $criteria);
-        $query->joinWith('Combination', $joinBehavior);
+        $query->joinWith('Stock', $joinBehavior);
 
         return $this->getCartItems($query, $con);
     }

core/lib/Thelia/Model/Base/CartItem.php

@@ -20,10 +20,10 @@ use Thelia\Model\Cart as ChildCart;
 use Thelia\Model\CartItem as ChildCartItem;
 use Thelia\Model\CartItemQuery as ChildCartItemQuery;
 use Thelia\Model\CartQuery as ChildCartQuery;
-use Thelia\Model\Combination as ChildCombination;
-use Thelia\Model\CombinationQuery as ChildCombinationQuery;
 use Thelia\Model\Product as ChildProduct;
 use Thelia\Model\ProductQuery as ChildProductQuery;
+use Thelia\Model\Stock as ChildStock;
+use Thelia\Model\StockQuery as ChildStockQuery;
 use Thelia\Model\Map\CartItemTableMap;
 
 abstract class CartItem implements ActiveRecordInterface
@@ -86,10 +86,10 @@ abstract class CartItem implements ActiveRecordInterface
     protected $quantity;
 
     /**
-     * The value for the combination_id field.
+     * The value for the stock_id field.
      * @var        int
      */
-    protected $combination_id;
+    protected $stock_id;
 
     /**
      * The value for the created_at field.
@@ -114,9 +114,9 @@ abstract class CartItem implements ActiveRecordInterface
     protected $aProduct;
 
     /**
-     * @var        Combination
+     * @var        Stock
      */
-    protected $aCombination;
+    protected $aStock;
 
     /**
      * Flag to prevent endless save loop, if this object is referenced
@@ -438,14 +438,14 @@ abstract class CartItem implements ActiveRecordInterface
     }
 
     /**
-     * Get the [combination_id] column value.
+     * Get the [stock_id] column value.
      *
      * @return   int
      */
-    public function getCombinationId()
+    public function getStockId()
     {
 
-        return $this->combination_id;
+        return $this->stock_id;
     }
 
     /**
@@ -581,29 +581,29 @@ abstract class CartItem implements ActiveRecordInterface
     } // setQuantity()
 
     /**
-     * Set the value of [combination_id] column.
+     * Set the value of [stock_id] column.
      *
      * @param      int $v new value
      * @return   \Thelia\Model\CartItem The current object (for fluent API support)
      */
-    public function setCombinationId($v)
+    public function setStockId($v)
     {
         if ($v !== null) {
             $v = (int) $v;
         }
 
-        if ($this->combination_id !== $v) {
+        if ($this->stock_id !== $v) {
-            $this->combination_id = $v;
+            $this->stock_id = $v;
-            $this->modifiedColumns[] = CartItemTableMap::COMBINATION_ID;
+            $this->modifiedColumns[] = CartItemTableMap::STOCK_ID;
         }
 
-        if ($this->aCombination !== null && $this->aCombination->getId() !== $v) {
+        if ($this->aStock !== null && $this->aStock->getId() !== $v) {
-            $this->aCombination = null;
+            $this->aStock = null;
         }
 
 
         return $this;
-    } // setCombinationId()
+    } // setStockId()
 
     /**
      * Sets the value of [created_at] column to a normalized version of the date/time value specified.
@@ -700,8 +700,8 @@ abstract class CartItem implements ActiveRecordInterface
             $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : CartItemTableMap::translateFieldName('Quantity', TableMap::TYPE_PHPNAME, $indexType)];
             $this->quantity = (null !== $col) ? (double) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CartItemTableMap::translateFieldName('CombinationId', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CartItemTableMap::translateFieldName('StockId', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->combination_id = (null !== $col) ? (int) $col : null;
+            $this->stock_id = (null !== $col) ? (int) $col : null;
 
             $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : CartItemTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
@@ -750,8 +750,8 @@ abstract class CartItem implements ActiveRecordInterface
         if ($this->aProduct !== null && $this->product_id !== $this->aProduct->getId()) {
             $this->aProduct = null;
         }
-        if ($this->aCombination !== null && $this->combination_id !== $this->aCombination->getId()) {
+        if ($this->aStock !== null && $this->stock_id !== $this->aStock->getId()) {
-            $this->aCombination = null;
+            $this->aStock = null;
         }
     } // ensureConsistency
 
@@ -794,7 +794,7 @@ abstract class CartItem implements ActiveRecordInterface
 
             $this->aCart = null;
             $this->aProduct = null;
-            $this->aCombination = null;
+            $this->aStock = null;
         } // if (deep)
     }
 
@@ -936,11 +936,11 @@ abstract class CartItem implements ActiveRecordInterface
                 $this->setProduct($this->aProduct);
             }
 
-            if ($this->aCombination !== null) {
+            if ($this->aStock !== null) {
-                if ($this->aCombination->isModified() || $this->aCombination->isNew()) {
+                if ($this->aStock->isModified() || $this->aStock->isNew()) {
-                    $affectedRows += $this->aCombination->save($con);
+                    $affectedRows += $this->aStock->save($con);
                 }
-                $this->setCombination($this->aCombination);
+                $this->setStock($this->aStock);
             }
 
             if ($this->isNew() || $this->isModified()) {
@@ -992,8 +992,8 @@ abstract class CartItem implements ActiveRecordInterface
         if ($this->isColumnModified(CartItemTableMap::QUANTITY)) {
             $modifiedColumns[':p' . $index++]  = 'QUANTITY';
         }
-        if ($this->isColumnModified(CartItemTableMap::COMBINATION_ID)) {
+        if ($this->isColumnModified(CartItemTableMap::STOCK_ID)) {
-            $modifiedColumns[':p' . $index++]  = 'COMBINATION_ID';
+            $modifiedColumns[':p' . $index++]  = 'STOCK_ID';
         }
         if ($this->isColumnModified(CartItemTableMap::CREATED_AT)) {
             $modifiedColumns[':p' . $index++]  = 'CREATED_AT';
@@ -1024,8 +1024,8 @@ abstract class CartItem implements ActiveRecordInterface
                     case 'QUANTITY':
                         $stmt->bindValue($identifier, $this->quantity, PDO::PARAM_STR);
                         break;
-                    case 'COMBINATION_ID':
+                    case 'STOCK_ID':
-                        $stmt->bindValue($identifier, $this->combination_id, PDO::PARAM_INT);
+                        $stmt->bindValue($identifier, $this->stock_id, PDO::PARAM_INT);
                         break;
                     case 'CREATED_AT':
                         $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
@@ -1108,7 +1108,7 @@ abstract class CartItem implements ActiveRecordInterface
                 return $this->getQuantity();
                 break;
             case 4:
-                return $this->getCombinationId();
+                return $this->getStockId();
                 break;
             case 5:
                 return $this->getCreatedAt();
@@ -1149,7 +1149,7 @@ abstract class CartItem implements ActiveRecordInterface
             $keys[1] => $this->getCartId(),
             $keys[2] => $this->getProductId(),
             $keys[3] => $this->getQuantity(),
-            $keys[4] => $this->getCombinationId(),
+            $keys[4] => $this->getStockId(),
             $keys[5] => $this->getCreatedAt(),
             $keys[6] => $this->getUpdatedAt(),
         );
@@ -1166,8 +1166,8 @@ abstract class CartItem implements ActiveRecordInterface
             if (null !== $this->aProduct) {
                 $result['Product'] = $this->aProduct->toArray($keyType, $includeLazyLoadColumns,  $alreadyDumpedObjects, true);
             }
-            if (null !== $this->aCombination) {
+            if (null !== $this->aStock) {
-                $result['Combination'] = $this->aCombination->toArray($keyType, $includeLazyLoadColumns,  $alreadyDumpedObjects, true);
+                $result['Stock'] = $this->aStock->toArray($keyType, $includeLazyLoadColumns,  $alreadyDumpedObjects, true);
             }
         }
 
@@ -1216,7 +1216,7 @@ abstract class CartItem implements ActiveRecordInterface
                 $this->setQuantity($value);
                 break;
             case 4:
-                $this->setCombinationId($value);
+                $this->setStockId($value);
                 break;
             case 5:
                 $this->setCreatedAt($value);
@@ -1252,7 +1252,7 @@ abstract class CartItem implements ActiveRecordInterface
         if (array_key_exists($keys[1], $arr)) $this->setCartId($arr[$keys[1]]);
         if (array_key_exists($keys[2], $arr)) $this->setProductId($arr[$keys[2]]);
         if (array_key_exists($keys[3], $arr)) $this->setQuantity($arr[$keys[3]]);
-        if (array_key_exists($keys[4], $arr)) $this->setCombinationId($arr[$keys[4]]);
+        if (array_key_exists($keys[4], $arr)) $this->setStockId($arr[$keys[4]]);
         if (array_key_exists($keys[5], $arr)) $this->setCreatedAt($arr[$keys[5]]);
         if (array_key_exists($keys[6], $arr)) $this->setUpdatedAt($arr[$keys[6]]);
     }
@@ -1270,7 +1270,7 @@ abstract class CartItem implements ActiveRecordInterface
         if ($this->isColumnModified(CartItemTableMap::CART_ID)) $criteria->add(CartItemTableMap::CART_ID, $this->cart_id);
         if ($this->isColumnModified(CartItemTableMap::PRODUCT_ID)) $criteria->add(CartItemTableMap::PRODUCT_ID, $this->product_id);
         if ($this->isColumnModified(CartItemTableMap::QUANTITY)) $criteria->add(CartItemTableMap::QUANTITY, $this->quantity);
-        if ($this->isColumnModified(CartItemTableMap::COMBINATION_ID)) $criteria->add(CartItemTableMap::COMBINATION_ID, $this->combination_id);
+        if ($this->isColumnModified(CartItemTableMap::STOCK_ID)) $criteria->add(CartItemTableMap::STOCK_ID, $this->stock_id);
         if ($this->isColumnModified(CartItemTableMap::CREATED_AT)) $criteria->add(CartItemTableMap::CREATED_AT, $this->created_at);
         if ($this->isColumnModified(CartItemTableMap::UPDATED_AT)) $criteria->add(CartItemTableMap::UPDATED_AT, $this->updated_at);
 
@@ -1339,7 +1339,7 @@ abstract class CartItem implements ActiveRecordInterface
         $copyObj->setCartId($this->getCartId());
         $copyObj->setProductId($this->getProductId());
         $copyObj->setQuantity($this->getQuantity());
-        $copyObj->setCombinationId($this->getCombinationId());
+        $copyObj->setStockId($this->getStockId());
         $copyObj->setCreatedAt($this->getCreatedAt());
         $copyObj->setUpdatedAt($this->getUpdatedAt());
         if ($makeNew) {
@@ -1473,24 +1473,24 @@ abstract class CartItem implements ActiveRecordInterface
     }
 
     /**
-     * Declares an association between this object and a ChildCombination object.
+     * Declares an association between this object and a ChildStock object.
      *
-     * @param                  ChildCombination $v
+     * @param                  ChildStock $v
      * @return                 \Thelia\Model\CartItem The current object (for fluent API support)
      * @throws PropelException
      */
-    public function setCombination(ChildCombination $v = null)
+    public function setStock(ChildStock $v = null)
     {
         if ($v === null) {
-            $this->setCombinationId(NULL);
+            $this->setStockId(NULL);
         } else {
-            $this->setCombinationId($v->getId());
+            $this->setStockId($v->getId());
         }
 
-        $this->aCombination = $v;
+        $this->aStock = $v;
 
         // Add binding for other direction of this n:n relationship.
-        // If this object has already been added to the ChildCombination object, it will not be re-added.
+        // If this object has already been added to the ChildStock object, it will not be re-added.
         if ($v !== null) {
             $v->addCartItem($this);
         }
@@ -1501,26 +1501,26 @@ abstract class CartItem implements ActiveRecordInterface
 
 
     /**
-     * Get the associated ChildCombination object
+     * Get the associated ChildStock object
      *
      * @param      ConnectionInterface $con Optional Connection object.
-     * @return                 ChildCombination The associated ChildCombination object.
+     * @return                 ChildStock The associated ChildStock object.
      * @throws PropelException
      */
-    public function getCombination(ConnectionInterface $con = null)
+    public function getStock(ConnectionInterface $con = null)
     {
-        if ($this->aCombination === null && ($this->combination_id !== null)) {
+        if ($this->aStock === null && ($this->stock_id !== null)) {
-            $this->aCombination = ChildCombinationQuery::create()->findPk($this->combination_id, $con);
+            $this->aStock = ChildStockQuery::create()->findPk($this->stock_id, $con);
             /* The following can be used additionally to
                 guarantee the related object contains a reference
                 to this object.  This level of coupling may, however, be
                 undesirable since it could result in an only partially populated collection
                 in the referenced object.
-                $this->aCombination->addCartItems($this);
+                $this->aStock->addCartItems($this);
              */
         }
 
-        return $this->aCombination;
+        return $this->aStock;
     }
 
     /**
@@ -1532,7 +1532,7 @@ abstract class CartItem implements ActiveRecordInterface
         $this->cart_id = null;
         $this->product_id = null;
         $this->quantity = null;
-        $this->combination_id = null;
+        $this->stock_id = null;
         $this->created_at = null;
         $this->updated_at = null;
         $this->alreadyInSave = false;
@@ -1559,7 +1559,7 @@ abstract class CartItem implements ActiveRecordInterface
 
         $this->aCart = null;
         $this->aProduct = null;
-        $this->aCombination = null;
+        $this->aStock = null;
     }
 
     /**

core/lib/Thelia/Model/Base/CartItemQuery.php

@@ -25,7 +25,7 @@ use Thelia\Model\Map\CartItemTableMap;
  * @method     ChildCartItemQuery orderByCartId($order = Criteria::ASC) Order by the cart_id column
  * @method     ChildCartItemQuery orderByProductId($order = Criteria::ASC) Order by the product_id column
  * @method     ChildCartItemQuery orderByQuantity($order = Criteria::ASC) Order by the quantity column
- * @method     ChildCartItemQuery orderByCombinationId($order = Criteria::ASC) Order by the combination_id column
+ * @method     ChildCartItemQuery orderByStockId($order = Criteria::ASC) Order by the stock_id column
  * @method     ChildCartItemQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
  * @method     ChildCartItemQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
  *
@@ -33,7 +33,7 @@ use Thelia\Model\Map\CartItemTableMap;
  * @method     ChildCartItemQuery groupByCartId() Group by the cart_id column
  * @method     ChildCartItemQuery groupByProductId() Group by the product_id column
  * @method     ChildCartItemQuery groupByQuantity() Group by the quantity column
- * @method     ChildCartItemQuery groupByCombinationId() Group by the combination_id column
+ * @method     ChildCartItemQuery groupByStockId() Group by the stock_id column
  * @method     ChildCartItemQuery groupByCreatedAt() Group by the created_at column
  * @method     ChildCartItemQuery groupByUpdatedAt() Group by the updated_at column
  *
@@ -49,9 +49,9 @@ use Thelia\Model\Map\CartItemTableMap;
  * @method     ChildCartItemQuery rightJoinProduct($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Product relation
  * @method     ChildCartItemQuery innerJoinProduct($relationAlias = null) Adds a INNER JOIN clause to the query using the Product relation
  *
- * @method     ChildCartItemQuery leftJoinCombination($relationAlias = null) Adds a LEFT JOIN clause to the query using the Combination relation
+ * @method     ChildCartItemQuery leftJoinStock($relationAlias = null) Adds a LEFT JOIN clause to the query using the Stock relation
- * @method     ChildCartItemQuery rightJoinCombination($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Combination relation
+ * @method     ChildCartItemQuery rightJoinStock($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Stock relation
- * @method     ChildCartItemQuery innerJoinCombination($relationAlias = null) Adds a INNER JOIN clause to the query using the Combination relation
+ * @method     ChildCartItemQuery innerJoinStock($relationAlias = null) Adds a INNER JOIN clause to the query using the Stock relation
  *
  * @method     ChildCartItem findOne(ConnectionInterface $con = null) Return the first ChildCartItem matching the query
  * @method     ChildCartItem findOneOrCreate(ConnectionInterface $con = null) Return the first ChildCartItem matching the query, or a new ChildCartItem object populated from the query conditions when no match is found
@@ -60,7 +60,7 @@ use Thelia\Model\Map\CartItemTableMap;
  * @method     ChildCartItem findOneByCartId(int $cart_id) Return the first ChildCartItem filtered by the cart_id column
  * @method     ChildCartItem findOneByProductId(int $product_id) Return the first ChildCartItem filtered by the product_id column
  * @method     ChildCartItem findOneByQuantity(double $quantity) Return the first ChildCartItem filtered by the quantity column
- * @method     ChildCartItem findOneByCombinationId(int $combination_id) Return the first ChildCartItem filtered by the combination_id column
+ * @method     ChildCartItem findOneByStockId(int $stock_id) Return the first ChildCartItem filtered by the stock_id column
  * @method     ChildCartItem findOneByCreatedAt(string $created_at) Return the first ChildCartItem filtered by the created_at column
  * @method     ChildCartItem findOneByUpdatedAt(string $updated_at) Return the first ChildCartItem filtered by the updated_at column
  *
@@ -68,7 +68,7 @@ use Thelia\Model\Map\CartItemTableMap;
  * @method     array findByCartId(int $cart_id) Return ChildCartItem objects filtered by the cart_id column
  * @method     array findByProductId(int $product_id) Return ChildCartItem objects filtered by the product_id column
  * @method     array findByQuantity(double $quantity) Return ChildCartItem objects filtered by the quantity column
- * @method     array findByCombinationId(int $combination_id) Return ChildCartItem objects filtered by the combination_id column
+ * @method     array findByStockId(int $stock_id) Return ChildCartItem objects filtered by the stock_id column
  * @method     array findByCreatedAt(string $created_at) Return ChildCartItem objects filtered by the created_at column
  * @method     array findByUpdatedAt(string $updated_at) Return ChildCartItem objects filtered by the updated_at column
  *
@@ -159,7 +159,7 @@ abstract class CartItemQuery extends ModelCriteria
      */
     protected function findPkSimple($key, $con)
     {
-        $sql = 'SELECT ID, CART_ID, PRODUCT_ID, QUANTITY, COMBINATION_ID, CREATED_AT, UPDATED_AT FROM cart_item WHERE ID = :p0';
+        $sql = 'SELECT ID, CART_ID, PRODUCT_ID, QUANTITY, STOCK_ID, CREATED_AT, UPDATED_AT FROM cart_item WHERE ID = :p0';
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -417,18 +417,18 @@ abstract class CartItemQuery extends ModelCriteria
     }
 
     /**
-     * Filter the query on the combination_id column
+     * Filter the query on the stock_id column
      *
      * Example usage:
      * <code>
-     * $query->filterByCombinationId(1234); // WHERE combination_id = 1234
+     * $query->filterByStockId(1234); // WHERE stock_id = 1234
-     * $query->filterByCombinationId(array(12, 34)); // WHERE combination_id IN (12, 34)
+     * $query->filterByStockId(array(12, 34)); // WHERE stock_id IN (12, 34)
-     * $query->filterByCombinationId(array('min' => 12)); // WHERE combination_id > 12
+     * $query->filterByStockId(array('min' => 12)); // WHERE stock_id > 12
      * </code>
      *
-     * @see       filterByCombination()
+     * @see       filterByStock()
      *
-     * @param     mixed $combinationId The value to use as filter.
+     * @param     mixed $stockId The value to use as filter.
      *              Use scalar values for equality.
      *              Use array values for in_array() equivalent.
      *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
@@ -436,16 +436,16 @@ abstract class CartItemQuery extends ModelCriteria
      *
      * @return ChildCartItemQuery The current query, for fluid interface
      */
-    public function filterByCombinationId($combinationId = null, $comparison = null)
+    public function filterByStockId($stockId = null, $comparison = null)
     {
-        if (is_array($combinationId)) {
+        if (is_array($stockId)) {
             $useMinMax = false;
-            if (isset($combinationId['min'])) {
+            if (isset($stockId['min'])) {
-                $this->addUsingAlias(CartItemTableMap::COMBINATION_ID, $combinationId['min'], Criteria::GREATER_EQUAL);
+                $this->addUsingAlias(CartItemTableMap::STOCK_ID, $stockId['min'], Criteria::GREATER_EQUAL);
                 $useMinMax = true;
             }
-            if (isset($combinationId['max'])) {
+            if (isset($stockId['max'])) {
-                $this->addUsingAlias(CartItemTableMap::COMBINATION_ID, $combinationId['max'], Criteria::LESS_EQUAL);
+                $this->addUsingAlias(CartItemTableMap::STOCK_ID, $stockId['max'], Criteria::LESS_EQUAL);
                 $useMinMax = true;
             }
             if ($useMinMax) {
@@ -456,7 +456,7 @@ abstract class CartItemQuery extends ModelCriteria
             }
         }
 
-        return $this->addUsingAlias(CartItemTableMap::COMBINATION_ID, $combinationId, $comparison);
+        return $this->addUsingAlias(CartItemTableMap::STOCK_ID, $stockId, $comparison);
     }
 
     /**
@@ -696,42 +696,42 @@ abstract class CartItemQuery extends ModelCriteria
     }
 
     /**
-     * Filter the query by a related \Thelia\Model\Combination object
+     * Filter the query by a related \Thelia\Model\Stock object
      *
-     * @param \Thelia\Model\Combination|ObjectCollection $combination The related object(s) to use as filter
+     * @param \Thelia\Model\Stock|ObjectCollection $stock The related object(s) to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildCartItemQuery The current query, for fluid interface
      */
-    public function filterByCombination($combination, $comparison = null)
+    public function filterByStock($stock, $comparison = null)
     {
-        if ($combination instanceof \Thelia\Model\Combination) {
+        if ($stock instanceof \Thelia\Model\Stock) {
             return $this
-                ->addUsingAlias(CartItemTableMap::COMBINATION_ID, $combination->getId(), $comparison);
+                ->addUsingAlias(CartItemTableMap::STOCK_ID, $stock->getId(), $comparison);
-        } elseif ($combination instanceof ObjectCollection) {
+        } elseif ($stock instanceof ObjectCollection) {
             if (null === $comparison) {
                 $comparison = Criteria::IN;
             }
 
             return $this
-                ->addUsingAlias(CartItemTableMap::COMBINATION_ID, $combination->toKeyValue('PrimaryKey', 'Id'), $comparison);
+                ->addUsingAlias(CartItemTableMap::STOCK_ID, $stock->toKeyValue('PrimaryKey', 'Id'), $comparison);
         } else {
-            throw new PropelException('filterByCombination() only accepts arguments of type \Thelia\Model\Combination or Collection');
+            throw new PropelException('filterByStock() only accepts arguments of type \Thelia\Model\Stock or Collection');
         }
     }
 
     /**
-     * Adds a JOIN clause to the query using the Combination relation
+     * Adds a JOIN clause to the query using the Stock relation
      *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildCartItemQuery The current query, for fluid interface
      */
-    public function joinCombination($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    public function joinStock($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
         $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('Combination');
+        $relationMap = $tableMap->getRelation('Stock');
 
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -746,14 +746,14 @@ abstract class CartItemQuery extends ModelCriteria
             $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
             $this->addJoinObject($join, $relationAlias);
         } else {
-            $this->addJoinObject($join, 'Combination');
+            $this->addJoinObject($join, 'Stock');
         }
 
         return $this;
     }
 
     /**
-     * Use the Combination relation Combination object
+     * Use the Stock relation Stock object
      *
      * @see useQuery()
      *
@@ -761,13 +761,13 @@ abstract class CartItemQuery extends ModelCriteria
      *                                   to be used as main alias in the secondary query
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return   \Thelia\Model\CombinationQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\StockQuery A secondary query class using the current class as primary query
      */
-    public function useCombinationQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    public function useStockQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
         return $this
-            ->joinCombination($relationAlias, $joinType)
+            ->joinStock($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'Combination', '\Thelia\Model\CombinationQuery');
+            ->useQuery($relationAlias ? $relationAlias : 'Stock', '\Thelia\Model\StockQuery');
     }
 
     /**

core/lib/Thelia/Model/Base/Category.php

@@ -5035,20 +5035,6 @@ abstract class Category implements ActiveRecordInterface
         return (string) $this->exportTo(CategoryTableMap::DEFAULT_STRING_FORMAT);
     }
 
-    // timestampable behavior
-
-    /**
-     * Mark the current object so that the update date doesn't get updated during next save
-     *
-     * @return     ChildCategory The current object (for fluent API support)
-     */
-    public function keepUpdateDateUnchanged()
-    {
-        $this->modifiedColumns[] = CategoryTableMap::UPDATED_AT;
-
-        return $this;
-    }
-
     // i18n behavior
 
     /**
@@ -5528,6 +5514,20 @@ abstract class Category implements ActiveRecordInterface
 
         return $this->getCategoryVersions($criteria, $con);
     }
+    // timestampable behavior
+
+    /**
+     * Mark the current object so that the update date doesn't get updated during next save
+     *
+     * @return     ChildCategory The current object (for fluent API support)
+     */
+    public function keepUpdateDateUnchanged()
+    {
+        $this->modifiedColumns[] = CategoryTableMap::UPDATED_AT;
+
+        return $this;
+    }
+
     /**
      * Code to be run before persisting the object
      * @param  ConnectionInterface $con

core/lib/Thelia/Model/Base/CategoryQuery.php

@@ -1450,72 +1450,6 @@ abstract class CategoryQuery extends ModelCriteria
         }
     }
 
-    // timestampable behavior
-
-    /**
-     * Filter by the latest updated
-     *
-     * @param      int $nbDays Maximum age of the latest update in days
-     *
-     * @return     ChildCategoryQuery The current query, for fluid interface
-     */
-    public function recentlyUpdated($nbDays = 7)
-    {
-        return $this->addUsingAlias(CategoryTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
-    }
-
-    /**
-     * Filter by the latest created
-     *
-     * @param      int $nbDays Maximum age of in days
-     *
-     * @return     ChildCategoryQuery The current query, for fluid interface
-     */
-    public function recentlyCreated($nbDays = 7)
-    {
-        return $this->addUsingAlias(CategoryTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
-    }
-
-    /**
-     * Order by update date desc
-     *
-     * @return     ChildCategoryQuery The current query, for fluid interface
-     */
-    public function lastUpdatedFirst()
-    {
-        return $this->addDescendingOrderByColumn(CategoryTableMap::UPDATED_AT);
-    }
-
-    /**
-     * Order by update date asc
-     *
-     * @return     ChildCategoryQuery The current query, for fluid interface
-     */
-    public function firstUpdatedFirst()
-    {
-        return $this->addAscendingOrderByColumn(CategoryTableMap::UPDATED_AT);
-    }
-
-    /**
-     * Order by create date desc
-     *
-     * @return     ChildCategoryQuery The current query, for fluid interface
-     */
-    public function lastCreatedFirst()
-    {
-        return $this->addDescendingOrderByColumn(CategoryTableMap::CREATED_AT);
-    }
-
-    /**
-     * Order by create date asc
-     *
-     * @return     ChildCategoryQuery The current query, for fluid interface
-     */
-    public function firstCreatedFirst()
-    {
-        return $this->addAscendingOrderByColumn(CategoryTableMap::CREATED_AT);
-    }
-
     // i18n behavior
 
     /**
@@ -1601,4 +1535,70 @@ abstract class CategoryQuery extends ModelCriteria
         self::$isVersioningEnabled = false;
     }
 
+    // timestampable behavior
+
+    /**
+     * Filter by the latest updated
+     *
+     * @param      int $nbDays Maximum age of the latest update in days
+     *
+     * @return     ChildCategoryQuery The current query, for fluid interface
+     */
+    public function recentlyUpdated($nbDays = 7)
+    {
+        return $this->addUsingAlias(CategoryTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+    }
+
+    /**
+     * Filter by the latest created
+     *
+     * @param      int $nbDays Maximum age of in days
+     *
+     * @return     ChildCategoryQuery The current query, for fluid interface
+     */
+    public function recentlyCreated($nbDays = 7)
+    {
+        return $this->addUsingAlias(CategoryTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+    }
+
+    /**
+     * Order by update date desc
+     *
+     * @return     ChildCategoryQuery The current query, for fluid interface
+     */
+    public function lastUpdatedFirst()
+    {
+        return $this->addDescendingOrderByColumn(CategoryTableMap::UPDATED_AT);
+    }
+
+    /**
+     * Order by update date asc
+     *
+     * @return     ChildCategoryQuery The current query, for fluid interface
+     */
+    public function firstUpdatedFirst()
+    {
+        return $this->addAscendingOrderByColumn(CategoryTableMap::UPDATED_AT);
+    }
+
+    /**
+     * Order by create date desc
+     *
+     * @return     ChildCategoryQuery The current query, for fluid interface
+     */
+    public function lastCreatedFirst()
+    {
+        return $this->addDescendingOrderByColumn(CategoryTableMap::CREATED_AT);
+    }
+
+    /**
+     * Order by create date asc
+     *
+     * @return     ChildCategoryQuery The current query, for fluid interface
+     */
+    public function firstCreatedFirst()
+    {
+        return $this->addAscendingOrderByColumn(CategoryTableMap::CREATED_AT);
+    }
+
 } // CategoryQuery

core/lib/Thelia/Model/Base/Currency.php

@@ -23,6 +23,8 @@ use Thelia\Model\Currency as ChildCurrency;
 use Thelia\Model\CurrencyQuery as ChildCurrencyQuery;
 use Thelia\Model\Order as ChildOrder;
 use Thelia\Model\OrderQuery as ChildOrderQuery;
+use Thelia\Model\ProductPrice as ChildProductPrice;
+use Thelia\Model\ProductPriceQuery as ChildProductPriceQuery;
 use Thelia\Model\Map\CurrencyTableMap;
 
 abstract class Currency implements ActiveRecordInterface
@@ -119,6 +121,12 @@ abstract class Currency implements ActiveRecordInterface
     protected $collCarts;
     protected $collCartsPartial;
 
+    /**
+     * @var        ObjectCollection|ChildProductPrice[] Collection to store aggregation of ChildProductPrice objects.
+     */
+    protected $collProductPrices;
+    protected $collProductPricesPartial;
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -139,6 +147,12 @@ abstract class Currency implements ActiveRecordInterface
      */
     protected $cartsScheduledForDeletion = null;
 
+    /**
+     * An array of objects scheduled for deletion.
+     * @var ObjectCollection
+     */
+    protected $productPricesScheduledForDeletion = null;
+
     /**
      * Initializes internal state of Thelia\Model\Base\Currency object.
      */
@@ -806,6 +820,8 @@ abstract class Currency implements ActiveRecordInterface
 
             $this->collCarts = null;
 
+            $this->collProductPrices = null;
+
         } // if (deep)
     }
 
@@ -975,6 +991,23 @@ abstract class Currency implements ActiveRecordInterface
                 }
             }
 
+            if ($this->productPricesScheduledForDeletion !== null) {
+                if (!$this->productPricesScheduledForDeletion->isEmpty()) {
+                    \Thelia\Model\ProductPriceQuery::create()
+                        ->filterByPrimaryKeys($this->productPricesScheduledForDeletion->getPrimaryKeys(false))
+                        ->delete($con);
+                    $this->productPricesScheduledForDeletion = null;
+                }
+            }
+
+                if ($this->collProductPrices !== null) {
+            foreach ($this->collProductPrices as $referrerFK) {
+                    if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
+                        $affectedRows += $referrerFK->save($con);
+                    }
+                }
+            }
+
             $this->alreadyInSave = false;
 
         }
@@ -1197,6 +1230,9 @@ abstract class Currency implements ActiveRecordInterface
             if (null !== $this->collCarts) {
                 $result['Carts'] = $this->collCarts->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
             }
+            if (null !== $this->collProductPrices) {
+                $result['ProductPrices'] = $this->collProductPrices->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+            }
         }
 
         return $result;
@@ -1394,6 +1430,12 @@ abstract class Currency implements ActiveRecordInterface
                 }
             }
 
+            foreach ($this->getProductPrices() as $relObj) {
+                if ($relObj !== $this) {  // ensure that we don't try to copy a reference to ourselves
+                    $copyObj->addProductPrice($relObj->copy($deepCopy));
+                }
+            }
+
         } // if ($deepCopy)
 
         if ($makeNew) {
@@ -1441,6 +1483,9 @@ abstract class Currency implements ActiveRecordInterface
         if ('Cart' == $relationName) {
             return $this->initCarts();
         }
+        if ('ProductPrice' == $relationName) {
+            return $this->initProductPrices();
+        }
     }
 
     /**
@@ -2054,6 +2099,249 @@ abstract class Currency implements ActiveRecordInterface
         return $this->getCarts($query, $con);
     }
 
+    /**
+     * Clears out the collProductPrices collection
+     *
+     * This does not modify the database; however, it will remove any associated objects, causing
+     * them to be refetched by subsequent calls to accessor method.
+     *
+     * @return void
+     * @see        addProductPrices()
+     */
+    public function clearProductPrices()
+    {
+        $this->collProductPrices = null; // important to set this to NULL since that means it is uninitialized
+    }
+
+    /**
+     * Reset is the collProductPrices collection loaded partially.
+     */
+    public function resetPartialProductPrices($v = true)
+    {
+        $this->collProductPricesPartial = $v;
+    }
+
+    /**
+     * Initializes the collProductPrices collection.
+     *
+     * By default this just sets the collProductPrices collection to an empty array (like clearcollProductPrices());
+     * however, you may wish to override this method in your stub class to provide setting appropriate
+     * to your application -- for example, setting the initial array to the values stored in database.
+     *
+     * @param      boolean $overrideExisting If set to true, the method call initializes
+     *                                        the collection even if it is not empty
+     *
+     * @return void
+     */
+    public function initProductPrices($overrideExisting = true)
+    {
+        if (null !== $this->collProductPrices && !$overrideExisting) {
+            return;
+        }
+        $this->collProductPrices = new ObjectCollection();
+        $this->collProductPrices->setModel('\Thelia\Model\ProductPrice');
+    }
+
+    /**
+     * Gets an array of ChildProductPrice objects which contain a foreign key that references this object.
+     *
+     * If the $criteria is not null, it is used to always fetch the results from the database.
+     * Otherwise the results are fetched from the database the first time, then cached.
+     * Next time the same method is called without $criteria, the cached collection is returned.
+     * If this ChildCurrency is new, it will return
+     * an empty collection or the current collection; the criteria is ignored on a new object.
+     *
+     * @param      Criteria $criteria optional Criteria object to narrow the query
+     * @param      ConnectionInterface $con optional connection object
+     * @return Collection|ChildProductPrice[] List of ChildProductPrice objects
+     * @throws PropelException
+     */
+    public function getProductPrices($criteria = null, ConnectionInterface $con = null)
+    {
+        $partial = $this->collProductPricesPartial && !$this->isNew();
+        if (null === $this->collProductPrices || null !== $criteria  || $partial) {
+            if ($this->isNew() && null === $this->collProductPrices) {
+                // return empty collection
+                $this->initProductPrices();
+            } else {
+                $collProductPrices = ChildProductPriceQuery::create(null, $criteria)
+                    ->filterByCurrency($this)
+                    ->find($con);
+
+                if (null !== $criteria) {
+                    if (false !== $this->collProductPricesPartial && count($collProductPrices)) {
+                        $this->initProductPrices(false);
+
+                        foreach ($collProductPrices as $obj) {
+                            if (false == $this->collProductPrices->contains($obj)) {
+                                $this->collProductPrices->append($obj);
+                            }
+                        }
+
+                        $this->collProductPricesPartial = true;
+                    }
+
+                    $collProductPrices->getInternalIterator()->rewind();
+
+                    return $collProductPrices;
+                }
+
+                if ($partial && $this->collProductPrices) {
+                    foreach ($this->collProductPrices as $obj) {
+                        if ($obj->isNew()) {
+                            $collProductPrices[] = $obj;
+                        }
+                    }
+                }
+
+                $this->collProductPrices = $collProductPrices;
+                $this->collProductPricesPartial = false;
+            }
+        }
+
+        return $this->collProductPrices;
+    }
+
+    /**
+     * Sets a collection of ProductPrice objects related by a one-to-many relationship
+     * to the current object.
+     * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+     * and new objects from the given Propel collection.
+     *
+     * @param      Collection $productPrices A Propel collection.
+     * @param      ConnectionInterface $con Optional connection object
+     * @return   ChildCurrency The current object (for fluent API support)
+     */
+    public function setProductPrices(Collection $productPrices, ConnectionInterface $con = null)
+    {
+        $productPricesToDelete = $this->getProductPrices(new Criteria(), $con)->diff($productPrices);
+
+
+        $this->productPricesScheduledForDeletion = $productPricesToDelete;
+
+        foreach ($productPricesToDelete as $productPriceRemoved) {
+            $productPriceRemoved->setCurrency(null);
+        }
+
+        $this->collProductPrices = null;
+        foreach ($productPrices as $productPrice) {
+            $this->addProductPrice($productPrice);
+        }
+
+        $this->collProductPrices = $productPrices;
+        $this->collProductPricesPartial = false;
+
+        return $this;
+    }
+
+    /**
+     * Returns the number of related ProductPrice objects.
+     *
+     * @param      Criteria $criteria
+     * @param      boolean $distinct
+     * @param      ConnectionInterface $con
+     * @return int             Count of related ProductPrice objects.
+     * @throws PropelException
+     */
+    public function countProductPrices(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
+    {
+        $partial = $this->collProductPricesPartial && !$this->isNew();
+        if (null === $this->collProductPrices || null !== $criteria || $partial) {
+            if ($this->isNew() && null === $this->collProductPrices) {
+                return 0;
+            }
+
+            if ($partial && !$criteria) {
+                return count($this->getProductPrices());
+            }
+
+            $query = ChildProductPriceQuery::create(null, $criteria);
+            if ($distinct) {
+                $query->distinct();
+            }
+
+            return $query
+                ->filterByCurrency($this)
+                ->count($con);
+        }
+
+        return count($this->collProductPrices);
+    }
+
+    /**
+     * Method called to associate a ChildProductPrice object to this object
+     * through the ChildProductPrice foreign key attribute.
+     *
+     * @param    ChildProductPrice $l ChildProductPrice
+     * @return   \Thelia\Model\Currency The current object (for fluent API support)
+     */
+    public function addProductPrice(ChildProductPrice $l)
+    {
+        if ($this->collProductPrices === null) {
+            $this->initProductPrices();
+            $this->collProductPricesPartial = true;
+        }
+
+        if (!in_array($l, $this->collProductPrices->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
+            $this->doAddProductPrice($l);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param ProductPrice $productPrice The productPrice object to add.
+     */
+    protected function doAddProductPrice($productPrice)
+    {
+        $this->collProductPrices[]= $productPrice;
+        $productPrice->setCurrency($this);
+    }
+
+    /**
+     * @param  ProductPrice $productPrice The productPrice object to remove.
+     * @return ChildCurrency The current object (for fluent API support)
+     */
+    public function removeProductPrice($productPrice)
+    {
+        if ($this->getProductPrices()->contains($productPrice)) {
+            $this->collProductPrices->remove($this->collProductPrices->search($productPrice));
+            if (null === $this->productPricesScheduledForDeletion) {
+                $this->productPricesScheduledForDeletion = clone $this->collProductPrices;
+                $this->productPricesScheduledForDeletion->clear();
+            }
+            $this->productPricesScheduledForDeletion[]= clone $productPrice;
+            $productPrice->setCurrency(null);
+        }
+
+        return $this;
+    }
+
+
+    /**
+     * If this collection has already been initialized with
+     * an identical criteria, it returns the collection.
+     * Otherwise if this Currency is new, it will return
+     * an empty collection; or if this Currency has previously
+     * been saved, it will retrieve related ProductPrices from storage.
+     *
+     * This method is protected by default in order to keep the public
+     * api reasonable.  You can provide public methods for those you
+     * actually need in Currency.
+     *
+     * @param      Criteria $criteria optional Criteria object to narrow the query
+     * @param      ConnectionInterface $con optional connection object
+     * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+     * @return Collection|ChildProductPrice[] List of ChildProductPrice objects
+     */
+    public function getProductPricesJoinStock($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+    {
+        $query = ChildProductPriceQuery::create(null, $criteria);
+        $query->joinWith('Stock', $joinBehavior);
+
+        return $this->getProductPrices($query, $con);
+    }
+
     /**
      * Clears the current object and sets all attributes to their default values
      */
@@ -2096,6 +2384,11 @@ abstract class Currency implements ActiveRecordInterface
                     $o->clearAllReferences($deep);
                 }
             }
+            if ($this->collProductPrices) {
+                foreach ($this->collProductPrices as $o) {
+                    $o->clearAllReferences($deep);
+                }
+            }
         } // if ($deep)
 
         if ($this->collOrders instanceof Collection) {
@@ -2106,6 +2399,10 @@ abstract class Currency implements ActiveRecordInterface
             $this->collCarts->clearIterator();
         }
         $this->collCarts = null;
+        if ($this->collProductPrices instanceof Collection) {
+            $this->collProductPrices->clearIterator();
+        }
+        $this->collProductPrices = null;
     }
 
     /**

core/lib/Thelia/Model/Base/CurrencyQuery.php

@@ -51,6 +51,10 @@ use Thelia\Model\Map\CurrencyTableMap;
  * @method     ChildCurrencyQuery rightJoinCart($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Cart relation
  * @method     ChildCurrencyQuery innerJoinCart($relationAlias = null) Adds a INNER JOIN clause to the query using the Cart relation
  *
+ * @method     ChildCurrencyQuery leftJoinProductPrice($relationAlias = null) Adds a LEFT JOIN clause to the query using the ProductPrice relation
+ * @method     ChildCurrencyQuery rightJoinProductPrice($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ProductPrice relation
+ * @method     ChildCurrencyQuery innerJoinProductPrice($relationAlias = null) Adds a INNER JOIN clause to the query using the ProductPrice relation
+ *
  * @method     ChildCurrency findOne(ConnectionInterface $con = null) Return the first ChildCurrency matching the query
  * @method     ChildCurrency findOneOrCreate(ConnectionInterface $con = null) Return the first ChildCurrency matching the query, or a new ChildCurrency object populated from the query conditions when no match is found
  *
@@ -690,6 +694,79 @@ abstract class CurrencyQuery extends ModelCriteria
             ->useQuery($relationAlias ? $relationAlias : 'Cart', '\Thelia\Model\CartQuery');
     }
 
+    /**
+     * Filter the query by a related \Thelia\Model\ProductPrice object
+     *
+     * @param \Thelia\Model\ProductPrice|ObjectCollection $productPrice  the related object to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildCurrencyQuery The current query, for fluid interface
+     */
+    public function filterByProductPrice($productPrice, $comparison = null)
+    {
+        if ($productPrice instanceof \Thelia\Model\ProductPrice) {
+            return $this
+                ->addUsingAlias(CurrencyTableMap::ID, $productPrice->getCurrencyId(), $comparison);
+        } elseif ($productPrice instanceof ObjectCollection) {
+            return $this
+                ->useProductPriceQuery()
+                ->filterByPrimaryKeys($productPrice->getPrimaryKeys())
+                ->endUse();
+        } else {
+            throw new PropelException('filterByProductPrice() only accepts arguments of type \Thelia\Model\ProductPrice or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the ProductPrice relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return ChildCurrencyQuery The current query, for fluid interface
+     */
+    public function joinProductPrice($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('ProductPrice');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'ProductPrice');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the ProductPrice relation ProductPrice object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return   \Thelia\Model\ProductPriceQuery A secondary query class using the current class as primary query
+     */
+    public function useProductPriceQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        return $this
+            ->joinProductPrice($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'ProductPrice', '\Thelia\Model\ProductPriceQuery');
+    }
+
     /**
      * Exclude object from result
      *

core/lib/Thelia/Model/Base/Feature.php

@@ -26,8 +26,8 @@ use Thelia\Model\FeatureCategory as ChildFeatureCategory;
 use Thelia\Model\FeatureCategoryQuery as ChildFeatureCategoryQuery;
 use Thelia\Model\FeatureI18n as ChildFeatureI18n;
 use Thelia\Model\FeatureI18nQuery as ChildFeatureI18nQuery;
-use Thelia\Model\FeatureProd as ChildFeatureProd;
+use Thelia\Model\FeatureProduct as ChildFeatureProduct;
-use Thelia\Model\FeatureProdQuery as ChildFeatureProdQuery;
+use Thelia\Model\FeatureProductQuery as ChildFeatureProductQuery;
 use Thelia\Model\FeatureQuery as ChildFeatureQuery;
 use Thelia\Model\Map\FeatureTableMap;
 
@@ -103,10 +103,10 @@ abstract class Feature implements ActiveRecordInterface
     protected $collFeatureAvsPartial;
 
     /**
-     * @var        ObjectCollection|ChildFeatureProd[] Collection to store aggregation of ChildFeatureProd objects.
+     * @var        ObjectCollection|ChildFeatureProduct[] Collection to store aggregation of ChildFeatureProduct objects.
      */
-    protected $collFeatureProds;
+    protected $collFeatureProducts;
-    protected $collFeatureProdsPartial;
+    protected $collFeatureProductsPartial;
 
     /**
      * @var        ObjectCollection|ChildFeatureCategory[] Collection to store aggregation of ChildFeatureCategory objects.
@@ -163,7 +163,7 @@ abstract class Feature implements ActiveRecordInterface
      * An array of objects scheduled for deletion.
      * @var ObjectCollection
      */
-    protected $featureProdsScheduledForDeletion = null;
+    protected $featureProductsScheduledForDeletion = null;
 
     /**
      * An array of objects scheduled for deletion.
@@ -754,7 +754,7 @@ abstract class Feature implements ActiveRecordInterface
 
             $this->collFeatureAvs = null;
 
-            $this->collFeatureProds = null;
+            $this->collFeatureProducts = null;
 
             $this->collFeatureCategories = null;
 
@@ -938,17 +938,17 @@ abstract class Feature implements ActiveRecordInterface
                 }
             }
 
-            if ($this->featureProdsScheduledForDeletion !== null) {
+            if ($this->featureProductsScheduledForDeletion !== null) {
-                if (!$this->featureProdsScheduledForDeletion->isEmpty()) {
+                if (!$this->featureProductsScheduledForDeletion->isEmpty()) {
-                    \Thelia\Model\FeatureProdQuery::create()
+                    \Thelia\Model\FeatureProductQuery::create()
-                        ->filterByPrimaryKeys($this->featureProdsScheduledForDeletion->getPrimaryKeys(false))
+                        ->filterByPrimaryKeys($this->featureProductsScheduledForDeletion->getPrimaryKeys(false))
                         ->delete($con);
-                    $this->featureProdsScheduledForDeletion = null;
+                    $this->featureProductsScheduledForDeletion = null;
                 }
             }
 
-                if ($this->collFeatureProds !== null) {
+                if ($this->collFeatureProducts !== null) {
-            foreach ($this->collFeatureProds as $referrerFK) {
+            foreach ($this->collFeatureProducts as $referrerFK) {
                     if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
                         $affectedRows += $referrerFK->save($con);
                     }
@@ -1178,8 +1178,8 @@ abstract class Feature implements ActiveRecordInterface
             if (null !== $this->collFeatureAvs) {
                 $result['FeatureAvs'] = $this->collFeatureAvs->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
             }
-            if (null !== $this->collFeatureProds) {
+            if (null !== $this->collFeatureProducts) {
-                $result['FeatureProds'] = $this->collFeatureProds->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+                $result['FeatureProducts'] = $this->collFeatureProducts->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
             }
             if (null !== $this->collFeatureCategories) {
                 $result['FeatureCategories'] = $this->collFeatureCategories->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
@@ -1360,9 +1360,9 @@ abstract class Feature implements ActiveRecordInterface
                 }
             }
 
-            foreach ($this->getFeatureProds() as $relObj) {
+            foreach ($this->getFeatureProducts() as $relObj) {
                 if ($relObj !== $this) {  // ensure that we don't try to copy a reference to ourselves
-                    $copyObj->addFeatureProd($relObj->copy($deepCopy));
+                    $copyObj->addFeatureProduct($relObj->copy($deepCopy));
                 }
             }
 
@@ -1422,8 +1422,8 @@ abstract class Feature implements ActiveRecordInterface
         if ('FeatureAv' == $relationName) {
             return $this->initFeatureAvs();
         }
-        if ('FeatureProd' == $relationName) {
+        if ('FeatureProduct' == $relationName) {
-            return $this->initFeatureProds();
+            return $this->initFeatureProducts();
         }
         if ('FeatureCategory' == $relationName) {
             return $this->initFeatureCategories();
@@ -1652,31 +1652,31 @@ abstract class Feature implements ActiveRecordInterface
     }
 
     /**
-     * Clears out the collFeatureProds collection
+     * Clears out the collFeatureProducts collection
      *
      * This does not modify the database; however, it will remove any associated objects, causing
      * them to be refetched by subsequent calls to accessor method.
      *
      * @return void
-     * @see        addFeatureProds()
+     * @see        addFeatureProducts()
      */
-    public function clearFeatureProds()
+    public function clearFeatureProducts()
     {
-        $this->collFeatureProds = null; // important to set this to NULL since that means it is uninitialized
+        $this->collFeatureProducts = null; // important to set this to NULL since that means it is uninitialized
     }
 
     /**
-     * Reset is the collFeatureProds collection loaded partially.
+     * Reset is the collFeatureProducts collection loaded partially.
      */
-    public function resetPartialFeatureProds($v = true)
+    public function resetPartialFeatureProducts($v = true)
     {
-        $this->collFeatureProdsPartial = $v;
+        $this->collFeatureProductsPartial = $v;
     }
 
     /**
-     * Initializes the collFeatureProds collection.
+     * Initializes the collFeatureProducts collection.
      *
-     * By default this just sets the collFeatureProds collection to an empty array (like clearcollFeatureProds());
+     * By default this just sets the collFeatureProducts collection to an empty array (like clearcollFeatureProducts());
      * however, you may wish to override this method in your stub class to provide setting appropriate
      * to your application -- for example, setting the initial array to the values stored in database.
      *
@@ -1685,17 +1685,17 @@ abstract class Feature implements ActiveRecordInterface
      *
      * @return void
      */
-    public function initFeatureProds($overrideExisting = true)
+    public function initFeatureProducts($overrideExisting = true)
     {
-        if (null !== $this->collFeatureProds && !$overrideExisting) {
+        if (null !== $this->collFeatureProducts && !$overrideExisting) {
             return;
         }
-        $this->collFeatureProds = new ObjectCollection();
+        $this->collFeatureProducts = new ObjectCollection();
-        $this->collFeatureProds->setModel('\Thelia\Model\FeatureProd');
+        $this->collFeatureProducts->setModel('\Thelia\Model\FeatureProduct');
     }
 
     /**
-     * Gets an array of ChildFeatureProd objects which contain a foreign key that references this object.
+     * Gets an array of ChildFeatureProduct objects which contain a foreign key that references this object.
      *
      * If the $criteria is not null, it is used to always fetch the results from the database.
      * Otherwise the results are fetched from the database the first time, then cached.
@@ -1705,109 +1705,109 @@ abstract class Feature implements ActiveRecordInterface
      *
      * @param      Criteria $criteria optional Criteria object to narrow the query
      * @param      ConnectionInterface $con optional connection object
-     * @return Collection|ChildFeatureProd[] List of ChildFeatureProd objects
+     * @return Collection|ChildFeatureProduct[] List of ChildFeatureProduct objects
      * @throws PropelException
      */
-    public function getFeatureProds($criteria = null, ConnectionInterface $con = null)
+    public function getFeatureProducts($criteria = null, ConnectionInterface $con = null)
     {
-        $partial = $this->collFeatureProdsPartial && !$this->isNew();
+        $partial = $this->collFeatureProductsPartial && !$this->isNew();
-        if (null === $this->collFeatureProds || null !== $criteria  || $partial) {
+        if (null === $this->collFeatureProducts || null !== $criteria  || $partial) {
-            if ($this->isNew() && null === $this->collFeatureProds) {
+            if ($this->isNew() && null === $this->collFeatureProducts) {
                 // return empty collection
-                $this->initFeatureProds();
+                $this->initFeatureProducts();
             } else {
-                $collFeatureProds = ChildFeatureProdQuery::create(null, $criteria)
+                $collFeatureProducts = ChildFeatureProductQuery::create(null, $criteria)
                     ->filterByFeature($this)
                     ->find($con);
 
                 if (null !== $criteria) {
-                    if (false !== $this->collFeatureProdsPartial && count($collFeatureProds)) {
+                    if (false !== $this->collFeatureProductsPartial && count($collFeatureProducts)) {
-                        $this->initFeatureProds(false);
+                        $this->initFeatureProducts(false);
 
-                        foreach ($collFeatureProds as $obj) {
+                        foreach ($collFeatureProducts as $obj) {
-                            if (false == $this->collFeatureProds->contains($obj)) {
+                            if (false == $this->collFeatureProducts->contains($obj)) {
-                                $this->collFeatureProds->append($obj);
+                                $this->collFeatureProducts->append($obj);
                             }
                         }
 
-                        $this->collFeatureProdsPartial = true;
+                        $this->collFeatureProductsPartial = true;
                     }
 
-                    $collFeatureProds->getInternalIterator()->rewind();
+                    $collFeatureProducts->getInternalIterator()->rewind();
 
-                    return $collFeatureProds;
+                    return $collFeatureProducts;
                 }
 
-                if ($partial && $this->collFeatureProds) {
+                if ($partial && $this->collFeatureProducts) {
-                    foreach ($this->collFeatureProds as $obj) {
+                    foreach ($this->collFeatureProducts as $obj) {
                         if ($obj->isNew()) {
-                            $collFeatureProds[] = $obj;
+                            $collFeatureProducts[] = $obj;
                         }
                     }
                 }
 
-                $this->collFeatureProds = $collFeatureProds;
+                $this->collFeatureProducts = $collFeatureProducts;
-                $this->collFeatureProdsPartial = false;
+                $this->collFeatureProductsPartial = false;
             }
         }
 
-        return $this->collFeatureProds;
+        return $this->collFeatureProducts;
     }
 
     /**
-     * Sets a collection of FeatureProd objects related by a one-to-many relationship
+     * Sets a collection of FeatureProduct objects related by a one-to-many relationship
      * to the current object.
      * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
      * and new objects from the given Propel collection.
      *
-     * @param      Collection $featureProds A Propel collection.
+     * @param      Collection $featureProducts A Propel collection.
      * @param      ConnectionInterface $con Optional connection object
      * @return   ChildFeature The current object (for fluent API support)
      */
-    public function setFeatureProds(Collection $featureProds, ConnectionInterface $con = null)
+    public function setFeatureProducts(Collection $featureProducts, ConnectionInterface $con = null)
     {
-        $featureProdsToDelete = $this->getFeatureProds(new Criteria(), $con)->diff($featureProds);
+        $featureProductsToDelete = $this->getFeatureProducts(new Criteria(), $con)->diff($featureProducts);
 
 
-        $this->featureProdsScheduledForDeletion = $featureProdsToDelete;
+        $this->featureProductsScheduledForDeletion = $featureProductsToDelete;
 
-        foreach ($featureProdsToDelete as $featureProdRemoved) {
+        foreach ($featureProductsToDelete as $featureProductRemoved) {
-            $featureProdRemoved->setFeature(null);
+            $featureProductRemoved->setFeature(null);
         }
 
-        $this->collFeatureProds = null;
+        $this->collFeatureProducts = null;
-        foreach ($featureProds as $featureProd) {
+        foreach ($featureProducts as $featureProduct) {
-            $this->addFeatureProd($featureProd);
+            $this->addFeatureProduct($featureProduct);
         }
 
-        $this->collFeatureProds = $featureProds;
+        $this->collFeatureProducts = $featureProducts;
-        $this->collFeatureProdsPartial = false;
+        $this->collFeatureProductsPartial = false;
 
         return $this;
     }
 
     /**
-     * Returns the number of related FeatureProd objects.
+     * Returns the number of related FeatureProduct objects.
      *
      * @param      Criteria $criteria
      * @param      boolean $distinct
      * @param      ConnectionInterface $con
-     * @return int             Count of related FeatureProd objects.
+     * @return int             Count of related FeatureProduct objects.
      * @throws PropelException
      */
-    public function countFeatureProds(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
+    public function countFeatureProducts(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
     {
-        $partial = $this->collFeatureProdsPartial && !$this->isNew();
+        $partial = $this->collFeatureProductsPartial && !$this->isNew();
-        if (null === $this->collFeatureProds || null !== $criteria || $partial) {
+        if (null === $this->collFeatureProducts || null !== $criteria || $partial) {
-            if ($this->isNew() && null === $this->collFeatureProds) {
+            if ($this->isNew() && null === $this->collFeatureProducts) {
                 return 0;
             }
 
             if ($partial && !$criteria) {
-                return count($this->getFeatureProds());
+                return count($this->getFeatureProducts());
             }
 
-            $query = ChildFeatureProdQuery::create(null, $criteria);
+            $query = ChildFeatureProductQuery::create(null, $criteria);
             if ($distinct) {
                 $query->distinct();
             }
@@ -1817,53 +1817,53 @@ abstract class Feature implements ActiveRecordInterface
                 ->count($con);
         }
 
-        return count($this->collFeatureProds);
+        return count($this->collFeatureProducts);
     }
 
     /**
-     * Method called to associate a ChildFeatureProd object to this object
+     * Method called to associate a ChildFeatureProduct object to this object
-     * through the ChildFeatureProd foreign key attribute.
+     * through the ChildFeatureProduct foreign key attribute.
      *
-     * @param    ChildFeatureProd $l ChildFeatureProd
+     * @param    ChildFeatureProduct $l ChildFeatureProduct
      * @return   \Thelia\Model\Feature The current object (for fluent API support)
      */
-    public function addFeatureProd(ChildFeatureProd $l)
+    public function addFeatureProduct(ChildFeatureProduct $l)
     {
-        if ($this->collFeatureProds === null) {
+        if ($this->collFeatureProducts === null) {
-            $this->initFeatureProds();
+            $this->initFeatureProducts();
-            $this->collFeatureProdsPartial = true;
+            $this->collFeatureProductsPartial = true;
         }
 
-        if (!in_array($l, $this->collFeatureProds->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
+        if (!in_array($l, $this->collFeatureProducts->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
-            $this->doAddFeatureProd($l);
+            $this->doAddFeatureProduct($l);
         }
 
         return $this;
     }
 
     /**
-     * @param FeatureProd $featureProd The featureProd object to add.
+     * @param FeatureProduct $featureProduct The featureProduct object to add.
      */
-    protected function doAddFeatureProd($featureProd)
+    protected function doAddFeatureProduct($featureProduct)
     {
-        $this->collFeatureProds[]= $featureProd;
+        $this->collFeatureProducts[]= $featureProduct;
-        $featureProd->setFeature($this);
+        $featureProduct->setFeature($this);
     }
 
     /**
-     * @param  FeatureProd $featureProd The featureProd object to remove.
+     * @param  FeatureProduct $featureProduct The featureProduct object to remove.
      * @return ChildFeature The current object (for fluent API support)
      */
-    public function removeFeatureProd($featureProd)
+    public function removeFeatureProduct($featureProduct)
     {
-        if ($this->getFeatureProds()->contains($featureProd)) {
+        if ($this->getFeatureProducts()->contains($featureProduct)) {
-            $this->collFeatureProds->remove($this->collFeatureProds->search($featureProd));
+            $this->collFeatureProducts->remove($this->collFeatureProducts->search($featureProduct));
-            if (null === $this->featureProdsScheduledForDeletion) {
+            if (null === $this->featureProductsScheduledForDeletion) {
-                $this->featureProdsScheduledForDeletion = clone $this->collFeatureProds;
+                $this->featureProductsScheduledForDeletion = clone $this->collFeatureProducts;
-                $this->featureProdsScheduledForDeletion->clear();
+                $this->featureProductsScheduledForDeletion->clear();
             }
-            $this->featureProdsScheduledForDeletion[]= clone $featureProd;
+            $this->featureProductsScheduledForDeletion[]= clone $featureProduct;
-            $featureProd->setFeature(null);
+            $featureProduct->setFeature(null);
         }
 
         return $this;
@@ -1875,7 +1875,7 @@ abstract class Feature implements ActiveRecordInterface
      * an identical criteria, it returns the collection.
      * Otherwise if this Feature is new, it will return
      * an empty collection; or if this Feature has previously
-     * been saved, it will retrieve related FeatureProds from storage.
+     * been saved, it will retrieve related FeatureProducts from storage.
      *
      * This method is protected by default in order to keep the public
      * api reasonable.  You can provide public methods for those you
@@ -1884,14 +1884,14 @@ abstract class Feature implements ActiveRecordInterface
      * @param      Criteria $criteria optional Criteria object to narrow the query
      * @param      ConnectionInterface $con optional connection object
      * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
-     * @return Collection|ChildFeatureProd[] List of ChildFeatureProd objects
+     * @return Collection|ChildFeatureProduct[] List of ChildFeatureProduct objects
      */
-    public function getFeatureProdsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+    public function getFeatureProductsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
     {
-        $query = ChildFeatureProdQuery::create(null, $criteria);
+        $query = ChildFeatureProductQuery::create(null, $criteria);
         $query->joinWith('Product', $joinBehavior);
 
-        return $this->getFeatureProds($query, $con);
+        return $this->getFeatureProducts($query, $con);
     }
 
 
@@ -1900,7 +1900,7 @@ abstract class Feature implements ActiveRecordInterface
      * an identical criteria, it returns the collection.
      * Otherwise if this Feature is new, it will return
      * an empty collection; or if this Feature has previously
-     * been saved, it will retrieve related FeatureProds from storage.
+     * been saved, it will retrieve related FeatureProducts from storage.
      *
      * This method is protected by default in order to keep the public
      * api reasonable.  You can provide public methods for those you
@@ -1909,14 +1909,14 @@ abstract class Feature implements ActiveRecordInterface
      * @param      Criteria $criteria optional Criteria object to narrow the query
      * @param      ConnectionInterface $con optional connection object
      * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
-     * @return Collection|ChildFeatureProd[] List of ChildFeatureProd objects
+     * @return Collection|ChildFeatureProduct[] List of ChildFeatureProduct objects
      */
-    public function getFeatureProdsJoinFeatureAv($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+    public function getFeatureProductsJoinFeatureAv($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
     {
-        $query = ChildFeatureProdQuery::create(null, $criteria);
+        $query = ChildFeatureProductQuery::create(null, $criteria);
         $query->joinWith('FeatureAv', $joinBehavior);
 
-        return $this->getFeatureProds($query, $con);
+        return $this->getFeatureProducts($query, $con);
     }
 
     /**
@@ -2605,8 +2605,8 @@ abstract class Feature implements ActiveRecordInterface
                     $o->clearAllReferences($deep);
                 }
             }
-            if ($this->collFeatureProds) {
+            if ($this->collFeatureProducts) {
-                foreach ($this->collFeatureProds as $o) {
+                foreach ($this->collFeatureProducts as $o) {
                     $o->clearAllReferences($deep);
                 }
             }
@@ -2635,10 +2635,10 @@ abstract class Feature implements ActiveRecordInterface
             $this->collFeatureAvs->clearIterator();
         }
         $this->collFeatureAvs = null;
-        if ($this->collFeatureProds instanceof Collection) {
+        if ($this->collFeatureProducts instanceof Collection) {
-            $this->collFeatureProds->clearIterator();
+            $this->collFeatureProducts->clearIterator();
         }
-        $this->collFeatureProds = null;
+        $this->collFeatureProducts = null;
         if ($this->collFeatureCategories instanceof Collection) {
             $this->collFeatureCategories->clearIterator();
         }

core/lib/Thelia/Model/Base/FeatureAv.php

@@ -22,8 +22,8 @@ use Thelia\Model\FeatureAv as ChildFeatureAv;
 use Thelia\Model\FeatureAvI18n as ChildFeatureAvI18n;
 use Thelia\Model\FeatureAvI18nQuery as ChildFeatureAvI18nQuery;
 use Thelia\Model\FeatureAvQuery as ChildFeatureAvQuery;
-use Thelia\Model\FeatureProd as ChildFeatureProd;
+use Thelia\Model\FeatureProduct as ChildFeatureProduct;
-use Thelia\Model\FeatureProdQuery as ChildFeatureProdQuery;
+use Thelia\Model\FeatureProductQuery as ChildFeatureProductQuery;
 use Thelia\Model\FeatureQuery as ChildFeatureQuery;
 use Thelia\Model\Map\FeatureAvTableMap;
 
@@ -73,6 +73,12 @@ abstract class FeatureAv implements ActiveRecordInterface
      */
     protected $feature_id;
 
+    /**
+     * The value for the position field.
+     * @var        int
+     */
+    protected $position;
+
     /**
      * The value for the created_at field.
      * @var        string
@@ -91,10 +97,10 @@ abstract class FeatureAv implements ActiveRecordInterface
     protected $aFeature;
 
     /**
-     * @var        ObjectCollection|ChildFeatureProd[] Collection to store aggregation of ChildFeatureProd objects.
+     * @var        ObjectCollection|ChildFeatureProduct[] Collection to store aggregation of ChildFeatureProduct objects.
      */
-    protected $collFeatureProds;
+    protected $collFeatureProducts;
-    protected $collFeatureProdsPartial;
+    protected $collFeatureProductsPartial;
 
     /**
      * @var        ObjectCollection|ChildFeatureAvI18n[] Collection to store aggregation of ChildFeatureAvI18n objects.
@@ -128,7 +134,7 @@ abstract class FeatureAv implements ActiveRecordInterface
      * An array of objects scheduled for deletion.
      * @var ObjectCollection
      */
-    protected $featureProdsScheduledForDeletion = null;
+    protected $featureProductsScheduledForDeletion = null;
 
     /**
      * An array of objects scheduled for deletion.
@@ -412,6 +418,17 @@ abstract class FeatureAv implements ActiveRecordInterface
         return $this->feature_id;
     }
 
+    /**
+     * Get the [position] column value.
+     *
+     * @return   int
+     */
+    public function getPosition()
+    {
+
+        return $this->position;
+    }
+
     /**
      * Get the [optionally formatted] temporal [created_at] column value.
      *
@@ -498,6 +515,27 @@ abstract class FeatureAv implements ActiveRecordInterface
         return $this;
     } // setFeatureId()
 
+    /**
+     * Set the value of [position] column.
+     *
+     * @param      int $v new value
+     * @return   \Thelia\Model\FeatureAv The current object (for fluent API support)
+     */
+    public function setPosition($v)
+    {
+        if ($v !== null) {
+            $v = (int) $v;
+        }
+
+        if ($this->position !== $v) {
+            $this->position = $v;
+            $this->modifiedColumns[] = FeatureAvTableMap::POSITION;
+        }
+
+
+        return $this;
+    } // setPosition()
+
     /**
      * Sets the value of [created_at] column to a normalized version of the date/time value specified.
      *
@@ -583,13 +621,16 @@ abstract class FeatureAv implements ActiveRecordInterface
             $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : FeatureAvTableMap::translateFieldName('FeatureId', TableMap::TYPE_PHPNAME, $indexType)];
             $this->feature_id = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : FeatureAvTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : FeatureAvTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->position = (null !== $col) ? (int) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : FeatureAvTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
             $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : FeatureAvTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : FeatureAvTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
@@ -602,7 +643,7 @@ abstract class FeatureAv implements ActiveRecordInterface
                 $this->ensureConsistency();
             }
 
-            return $startcol + 4; // 4 = FeatureAvTableMap::NUM_HYDRATE_COLUMNS.
+            return $startcol + 5; // 5 = FeatureAvTableMap::NUM_HYDRATE_COLUMNS.
 
         } catch (Exception $e) {
             throw new PropelException("Error populating \Thelia\Model\FeatureAv object", 0, $e);
@@ -667,7 +708,7 @@ abstract class FeatureAv implements ActiveRecordInterface
         if ($deep) {  // also de-associate any related objects?
 
             $this->aFeature = null;
-            $this->collFeatureProds = null;
+            $this->collFeatureProducts = null;
 
             $this->collFeatureAvI18ns = null;
 
@@ -816,17 +857,17 @@ abstract class FeatureAv implements ActiveRecordInterface
                 $this->resetModified();
             }
 
-            if ($this->featureProdsScheduledForDeletion !== null) {
+            if ($this->featureProductsScheduledForDeletion !== null) {
-                if (!$this->featureProdsScheduledForDeletion->isEmpty()) {
+                if (!$this->featureProductsScheduledForDeletion->isEmpty()) {
-                    \Thelia\Model\FeatureProdQuery::create()
+                    \Thelia\Model\FeatureProductQuery::create()
-                        ->filterByPrimaryKeys($this->featureProdsScheduledForDeletion->getPrimaryKeys(false))
+                        ->filterByPrimaryKeys($this->featureProductsScheduledForDeletion->getPrimaryKeys(false))
                         ->delete($con);
-                    $this->featureProdsScheduledForDeletion = null;
+                    $this->featureProductsScheduledForDeletion = null;
                 }
             }
 
-                if ($this->collFeatureProds !== null) {
+                if ($this->collFeatureProducts !== null) {
-            foreach ($this->collFeatureProds as $referrerFK) {
+            foreach ($this->collFeatureProducts as $referrerFK) {
                     if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
                         $affectedRows += $referrerFK->save($con);
                     }
@@ -882,6 +923,9 @@ abstract class FeatureAv implements ActiveRecordInterface
         if ($this->isColumnModified(FeatureAvTableMap::FEATURE_ID)) {
             $modifiedColumns[':p' . $index++]  = 'FEATURE_ID';
         }
+        if ($this->isColumnModified(FeatureAvTableMap::POSITION)) {
+            $modifiedColumns[':p' . $index++]  = 'POSITION';
+        }
         if ($this->isColumnModified(FeatureAvTableMap::CREATED_AT)) {
             $modifiedColumns[':p' . $index++]  = 'CREATED_AT';
         }
@@ -905,6 +949,9 @@ abstract class FeatureAv implements ActiveRecordInterface
                     case 'FEATURE_ID':
                         $stmt->bindValue($identifier, $this->feature_id, PDO::PARAM_INT);
                         break;
+                    case 'POSITION':
+                        $stmt->bindValue($identifier, $this->position, PDO::PARAM_INT);
+                        break;
                     case 'CREATED_AT':
                         $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
                         break;
@@ -980,9 +1027,12 @@ abstract class FeatureAv implements ActiveRecordInterface
                 return $this->getFeatureId();
                 break;
             case 2:
-                return $this->getCreatedAt();
+                return $this->getPosition();
                 break;
             case 3:
+                return $this->getCreatedAt();
+                break;
+            case 4:
                 return $this->getUpdatedAt();
                 break;
             default:
@@ -1016,8 +1066,9 @@ abstract class FeatureAv implements ActiveRecordInterface
         $result = array(
             $keys[0] => $this->getId(),
             $keys[1] => $this->getFeatureId(),
-            $keys[2] => $this->getCreatedAt(),
+            $keys[2] => $this->getPosition(),
-            $keys[3] => $this->getUpdatedAt(),
+            $keys[3] => $this->getCreatedAt(),
+            $keys[4] => $this->getUpdatedAt(),
         );
         $virtualColumns = $this->virtualColumns;
         foreach($virtualColumns as $key => $virtualColumn)
@@ -1029,8 +1080,8 @@ abstract class FeatureAv implements ActiveRecordInterface
             if (null !== $this->aFeature) {
                 $result['Feature'] = $this->aFeature->toArray($keyType, $includeLazyLoadColumns,  $alreadyDumpedObjects, true);
             }
-            if (null !== $this->collFeatureProds) {
+            if (null !== $this->collFeatureProducts) {
-                $result['FeatureProds'] = $this->collFeatureProds->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+                $result['FeatureProducts'] = $this->collFeatureProducts->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
             }
             if (null !== $this->collFeatureAvI18ns) {
                 $result['FeatureAvI18ns'] = $this->collFeatureAvI18ns->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
@@ -1076,9 +1127,12 @@ abstract class FeatureAv implements ActiveRecordInterface
                 $this->setFeatureId($value);
                 break;
             case 2:
-                $this->setCreatedAt($value);
+                $this->setPosition($value);
                 break;
             case 3:
+                $this->setCreatedAt($value);
+                break;
+            case 4:
                 $this->setUpdatedAt($value);
                 break;
         } // switch()
@@ -1107,8 +1161,9 @@ abstract class FeatureAv implements ActiveRecordInterface
 
         if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
         if (array_key_exists($keys[1], $arr)) $this->setFeatureId($arr[$keys[1]]);
-        if (array_key_exists($keys[2], $arr)) $this->setCreatedAt($arr[$keys[2]]);
+        if (array_key_exists($keys[2], $arr)) $this->setPosition($arr[$keys[2]]);
-        if (array_key_exists($keys[3], $arr)) $this->setUpdatedAt($arr[$keys[3]]);
+        if (array_key_exists($keys[3], $arr)) $this->setCreatedAt($arr[$keys[3]]);
+        if (array_key_exists($keys[4], $arr)) $this->setUpdatedAt($arr[$keys[4]]);
     }
 
     /**
@@ -1122,6 +1177,7 @@ abstract class FeatureAv implements ActiveRecordInterface
 
         if ($this->isColumnModified(FeatureAvTableMap::ID)) $criteria->add(FeatureAvTableMap::ID, $this->id);
         if ($this->isColumnModified(FeatureAvTableMap::FEATURE_ID)) $criteria->add(FeatureAvTableMap::FEATURE_ID, $this->feature_id);
+        if ($this->isColumnModified(FeatureAvTableMap::POSITION)) $criteria->add(FeatureAvTableMap::POSITION, $this->position);
         if ($this->isColumnModified(FeatureAvTableMap::CREATED_AT)) $criteria->add(FeatureAvTableMap::CREATED_AT, $this->created_at);
         if ($this->isColumnModified(FeatureAvTableMap::UPDATED_AT)) $criteria->add(FeatureAvTableMap::UPDATED_AT, $this->updated_at);
 
@@ -1188,6 +1244,7 @@ abstract class FeatureAv implements ActiveRecordInterface
     public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
     {
         $copyObj->setFeatureId($this->getFeatureId());
+        $copyObj->setPosition($this->getPosition());
         $copyObj->setCreatedAt($this->getCreatedAt());
         $copyObj->setUpdatedAt($this->getUpdatedAt());
 
@@ -1196,9 +1253,9 @@ abstract class FeatureAv implements ActiveRecordInterface
             // the getter/setter methods for fkey referrer objects.
             $copyObj->setNew(false);
 
-            foreach ($this->getFeatureProds() as $relObj) {
+            foreach ($this->getFeatureProducts() as $relObj) {
                 if ($relObj !== $this) {  // ensure that we don't try to copy a reference to ourselves
-                    $copyObj->addFeatureProd($relObj->copy($deepCopy));
+                    $copyObj->addFeatureProduct($relObj->copy($deepCopy));
                 }
             }
 
@@ -1300,8 +1357,8 @@ abstract class FeatureAv implements ActiveRecordInterface
      */
     public function initRelation($relationName)
     {
-        if ('FeatureProd' == $relationName) {
+        if ('FeatureProduct' == $relationName) {
-            return $this->initFeatureProds();
+            return $this->initFeatureProducts();
         }
         if ('FeatureAvI18n' == $relationName) {
             return $this->initFeatureAvI18ns();
@@ -1309,31 +1366,31 @@ abstract class FeatureAv implements ActiveRecordInterface
     }
 
     /**
-     * Clears out the collFeatureProds collection
+     * Clears out the collFeatureProducts collection
      *
      * This does not modify the database; however, it will remove any associated objects, causing
      * them to be refetched by subsequent calls to accessor method.
      *
      * @return void
-     * @see        addFeatureProds()
+     * @see        addFeatureProducts()
      */
-    public function clearFeatureProds()
+    public function clearFeatureProducts()
     {
-        $this->collFeatureProds = null; // important to set this to NULL since that means it is uninitialized
+        $this->collFeatureProducts = null; // important to set this to NULL since that means it is uninitialized
     }
 
     /**
-     * Reset is the collFeatureProds collection loaded partially.
+     * Reset is the collFeatureProducts collection loaded partially.
      */
-    public function resetPartialFeatureProds($v = true)
+    public function resetPartialFeatureProducts($v = true)
     {
-        $this->collFeatureProdsPartial = $v;
+        $this->collFeatureProductsPartial = $v;
     }
 
     /**
-     * Initializes the collFeatureProds collection.
+     * Initializes the collFeatureProducts collection.
      *
-     * By default this just sets the collFeatureProds collection to an empty array (like clearcollFeatureProds());
+     * By default this just sets the collFeatureProducts collection to an empty array (like clearcollFeatureProducts());
      * however, you may wish to override this method in your stub class to provide setting appropriate
      * to your application -- for example, setting the initial array to the values stored in database.
      *
@@ -1342,17 +1399,17 @@ abstract class FeatureAv implements ActiveRecordInterface
      *
      * @return void
      */
-    public function initFeatureProds($overrideExisting = true)
+    public function initFeatureProducts($overrideExisting = true)
     {
-        if (null !== $this->collFeatureProds && !$overrideExisting) {
+        if (null !== $this->collFeatureProducts && !$overrideExisting) {
             return;
         }
-        $this->collFeatureProds = new ObjectCollection();
+        $this->collFeatureProducts = new ObjectCollection();
-        $this->collFeatureProds->setModel('\Thelia\Model\FeatureProd');
+        $this->collFeatureProducts->setModel('\Thelia\Model\FeatureProduct');
     }
 
     /**
-     * Gets an array of ChildFeatureProd objects which contain a foreign key that references this object.
+     * Gets an array of ChildFeatureProduct objects which contain a foreign key that references this object.
      *
      * If the $criteria is not null, it is used to always fetch the results from the database.
      * Otherwise the results are fetched from the database the first time, then cached.
@@ -1362,109 +1419,109 @@ abstract class FeatureAv implements ActiveRecordInterface
      *
      * @param      Criteria $criteria optional Criteria object to narrow the query
      * @param      ConnectionInterface $con optional connection object
-     * @return Collection|ChildFeatureProd[] List of ChildFeatureProd objects
+     * @return Collection|ChildFeatureProduct[] List of ChildFeatureProduct objects
      * @throws PropelException
      */
-    public function getFeatureProds($criteria = null, ConnectionInterface $con = null)
+    public function getFeatureProducts($criteria = null, ConnectionInterface $con = null)
     {
-        $partial = $this->collFeatureProdsPartial && !$this->isNew();
+        $partial = $this->collFeatureProductsPartial && !$this->isNew();
-        if (null === $this->collFeatureProds || null !== $criteria  || $partial) {
+        if (null === $this->collFeatureProducts || null !== $criteria  || $partial) {
-            if ($this->isNew() && null === $this->collFeatureProds) {
+            if ($this->isNew() && null === $this->collFeatureProducts) {
                 // return empty collection
-                $this->initFeatureProds();
+                $this->initFeatureProducts();
             } else {
-                $collFeatureProds = ChildFeatureProdQuery::create(null, $criteria)
+                $collFeatureProducts = ChildFeatureProductQuery::create(null, $criteria)
                     ->filterByFeatureAv($this)
                     ->find($con);
 
                 if (null !== $criteria) {
-                    if (false !== $this->collFeatureProdsPartial && count($collFeatureProds)) {
+                    if (false !== $this->collFeatureProductsPartial && count($collFeatureProducts)) {
-                        $this->initFeatureProds(false);
+                        $this->initFeatureProducts(false);
 
-                        foreach ($collFeatureProds as $obj) {
+                        foreach ($collFeatureProducts as $obj) {
-                            if (false == $this->collFeatureProds->contains($obj)) {
+                            if (false == $this->collFeatureProducts->contains($obj)) {
-                                $this->collFeatureProds->append($obj);
+                                $this->collFeatureProducts->append($obj);
                             }
                         }
 
-                        $this->collFeatureProdsPartial = true;
+                        $this->collFeatureProductsPartial = true;
                     }
 
-                    $collFeatureProds->getInternalIterator()->rewind();
+                    $collFeatureProducts->getInternalIterator()->rewind();
 
-                    return $collFeatureProds;
+                    return $collFeatureProducts;
                 }
 
-                if ($partial && $this->collFeatureProds) {
+                if ($partial && $this->collFeatureProducts) {
-                    foreach ($this->collFeatureProds as $obj) {
+                    foreach ($this->collFeatureProducts as $obj) {
                         if ($obj->isNew()) {
-                            $collFeatureProds[] = $obj;
+                            $collFeatureProducts[] = $obj;
                         }
                     }
                 }
 
-                $this->collFeatureProds = $collFeatureProds;
+                $this->collFeatureProducts = $collFeatureProducts;
-                $this->collFeatureProdsPartial = false;
+                $this->collFeatureProductsPartial = false;
             }
         }
 
-        return $this->collFeatureProds;
+        return $this->collFeatureProducts;
     }
 
     /**
-     * Sets a collection of FeatureProd objects related by a one-to-many relationship
+     * Sets a collection of FeatureProduct objects related by a one-to-many relationship
      * to the current object.
      * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
      * and new objects from the given Propel collection.
      *
-     * @param      Collection $featureProds A Propel collection.
+     * @param      Collection $featureProducts A Propel collection.
      * @param      ConnectionInterface $con Optional connection object
      * @return   ChildFeatureAv The current object (for fluent API support)
      */
-    public function setFeatureProds(Collection $featureProds, ConnectionInterface $con = null)
+    public function setFeatureProducts(Collection $featureProducts, ConnectionInterface $con = null)
     {
-        $featureProdsToDelete = $this->getFeatureProds(new Criteria(), $con)->diff($featureProds);
+        $featureProductsToDelete = $this->getFeatureProducts(new Criteria(), $con)->diff($featureProducts);
 
 
-        $this->featureProdsScheduledForDeletion = $featureProdsToDelete;
+        $this->featureProductsScheduledForDeletion = $featureProductsToDelete;
 
-        foreach ($featureProdsToDelete as $featureProdRemoved) {
+        foreach ($featureProductsToDelete as $featureProductRemoved) {
-            $featureProdRemoved->setFeatureAv(null);
+            $featureProductRemoved->setFeatureAv(null);
         }
 
-        $this->collFeatureProds = null;
+        $this->collFeatureProducts = null;
-        foreach ($featureProds as $featureProd) {
+        foreach ($featureProducts as $featureProduct) {
-            $this->addFeatureProd($featureProd);
+            $this->addFeatureProduct($featureProduct);
         }
 
-        $this->collFeatureProds = $featureProds;
+        $this->collFeatureProducts = $featureProducts;
-        $this->collFeatureProdsPartial = false;
+        $this->collFeatureProductsPartial = false;
 
         return $this;
     }
 
     /**
-     * Returns the number of related FeatureProd objects.
+     * Returns the number of related FeatureProduct objects.
      *
      * @param      Criteria $criteria
      * @param      boolean $distinct
      * @param      ConnectionInterface $con
-     * @return int             Count of related FeatureProd objects.
+     * @return int             Count of related FeatureProduct objects.
      * @throws PropelException
      */
-    public function countFeatureProds(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
+    public function countFeatureProducts(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
     {
-        $partial = $this->collFeatureProdsPartial && !$this->isNew();
+        $partial = $this->collFeatureProductsPartial && !$this->isNew();
-        if (null === $this->collFeatureProds || null !== $criteria || $partial) {
+        if (null === $this->collFeatureProducts || null !== $criteria || $partial) {
-            if ($this->isNew() && null === $this->collFeatureProds) {
+            if ($this->isNew() && null === $this->collFeatureProducts) {
                 return 0;
             }
 
             if ($partial && !$criteria) {
-                return count($this->getFeatureProds());
+                return count($this->getFeatureProducts());
             }
 
-            $query = ChildFeatureProdQuery::create(null, $criteria);
+            $query = ChildFeatureProductQuery::create(null, $criteria);
             if ($distinct) {
                 $query->distinct();
             }
@@ -1474,53 +1531,53 @@ abstract class FeatureAv implements ActiveRecordInterface
                 ->count($con);
         }
 
-        return count($this->collFeatureProds);
+        return count($this->collFeatureProducts);
     }
 
     /**
-     * Method called to associate a ChildFeatureProd object to this object
+     * Method called to associate a ChildFeatureProduct object to this object
-     * through the ChildFeatureProd foreign key attribute.
+     * through the ChildFeatureProduct foreign key attribute.
      *
-     * @param    ChildFeatureProd $l ChildFeatureProd
+     * @param    ChildFeatureProduct $l ChildFeatureProduct
      * @return   \Thelia\Model\FeatureAv The current object (for fluent API support)
      */
-    public function addFeatureProd(ChildFeatureProd $l)
+    public function addFeatureProduct(ChildFeatureProduct $l)
     {
-        if ($this->collFeatureProds === null) {
+        if ($this->collFeatureProducts === null) {
-            $this->initFeatureProds();
+            $this->initFeatureProducts();
-            $this->collFeatureProdsPartial = true;
+            $this->collFeatureProductsPartial = true;
         }
 
-        if (!in_array($l, $this->collFeatureProds->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
+        if (!in_array($l, $this->collFeatureProducts->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
-            $this->doAddFeatureProd($l);
+            $this->doAddFeatureProduct($l);
         }
 
         return $this;
     }
 
     /**
-     * @param FeatureProd $featureProd The featureProd object to add.
+     * @param FeatureProduct $featureProduct The featureProduct object to add.
      */
-    protected function doAddFeatureProd($featureProd)
+    protected function doAddFeatureProduct($featureProduct)
     {
-        $this->collFeatureProds[]= $featureProd;
+        $this->collFeatureProducts[]= $featureProduct;
-        $featureProd->setFeatureAv($this);
+        $featureProduct->setFeatureAv($this);
     }
 
     /**
-     * @param  FeatureProd $featureProd The featureProd object to remove.
+     * @param  FeatureProduct $featureProduct The featureProduct object to remove.
      * @return ChildFeatureAv The current object (for fluent API support)
      */
-    public function removeFeatureProd($featureProd)
+    public function removeFeatureProduct($featureProduct)
     {
-        if ($this->getFeatureProds()->contains($featureProd)) {
+        if ($this->getFeatureProducts()->contains($featureProduct)) {
-            $this->collFeatureProds->remove($this->collFeatureProds->search($featureProd));
+            $this->collFeatureProducts->remove($this->collFeatureProducts->search($featureProduct));
-            if (null === $this->featureProdsScheduledForDeletion) {
+            if (null === $this->featureProductsScheduledForDeletion) {
-                $this->featureProdsScheduledForDeletion = clone $this->collFeatureProds;
+                $this->featureProductsScheduledForDeletion = clone $this->collFeatureProducts;
-                $this->featureProdsScheduledForDeletion->clear();
+                $this->featureProductsScheduledForDeletion->clear();
             }
-            $this->featureProdsScheduledForDeletion[]= $featureProd;
+            $this->featureProductsScheduledForDeletion[]= $featureProduct;
-            $featureProd->setFeatureAv(null);
+            $featureProduct->setFeatureAv(null);
         }
 
         return $this;
@@ -1532,7 +1589,7 @@ abstract class FeatureAv implements ActiveRecordInterface
      * an identical criteria, it returns the collection.
      * Otherwise if this FeatureAv is new, it will return
      * an empty collection; or if this FeatureAv has previously
-     * been saved, it will retrieve related FeatureProds from storage.
+     * been saved, it will retrieve related FeatureProducts from storage.
      *
      * This method is protected by default in order to keep the public
      * api reasonable.  You can provide public methods for those you
@@ -1541,14 +1598,14 @@ abstract class FeatureAv implements ActiveRecordInterface
      * @param      Criteria $criteria optional Criteria object to narrow the query
      * @param      ConnectionInterface $con optional connection object
      * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
-     * @return Collection|ChildFeatureProd[] List of ChildFeatureProd objects
+     * @return Collection|ChildFeatureProduct[] List of ChildFeatureProduct objects
      */
-    public function getFeatureProdsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+    public function getFeatureProductsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
     {
-        $query = ChildFeatureProdQuery::create(null, $criteria);
+        $query = ChildFeatureProductQuery::create(null, $criteria);
         $query->joinWith('Product', $joinBehavior);
 
-        return $this->getFeatureProds($query, $con);
+        return $this->getFeatureProducts($query, $con);
     }
 
 
@@ -1557,7 +1614,7 @@ abstract class FeatureAv implements ActiveRecordInterface
      * an identical criteria, it returns the collection.
      * Otherwise if this FeatureAv is new, it will return
      * an empty collection; or if this FeatureAv has previously
-     * been saved, it will retrieve related FeatureProds from storage.
+     * been saved, it will retrieve related FeatureProducts from storage.
      *
      * This method is protected by default in order to keep the public
      * api reasonable.  You can provide public methods for those you
@@ -1566,14 +1623,14 @@ abstract class FeatureAv implements ActiveRecordInterface
      * @param      Criteria $criteria optional Criteria object to narrow the query
      * @param      ConnectionInterface $con optional connection object
      * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
-     * @return Collection|ChildFeatureProd[] List of ChildFeatureProd objects
+     * @return Collection|ChildFeatureProduct[] List of ChildFeatureProduct objects
      */
-    public function getFeatureProdsJoinFeature($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+    public function getFeatureProductsJoinFeature($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
     {
-        $query = ChildFeatureProdQuery::create(null, $criteria);
+        $query = ChildFeatureProductQuery::create(null, $criteria);
         $query->joinWith('Feature', $joinBehavior);
 
-        return $this->getFeatureProds($query, $con);
+        return $this->getFeatureProducts($query, $con);
     }
 
     /**
@@ -1808,6 +1865,7 @@ abstract class FeatureAv implements ActiveRecordInterface
     {
         $this->id = null;
         $this->feature_id = null;
+        $this->position = null;
         $this->created_at = null;
         $this->updated_at = null;
         $this->alreadyInSave = false;
@@ -1829,8 +1887,8 @@ abstract class FeatureAv implements ActiveRecordInterface
     public function clearAllReferences($deep = false)
     {
         if ($deep) {
-            if ($this->collFeatureProds) {
+            if ($this->collFeatureProducts) {
-                foreach ($this->collFeatureProds as $o) {
+                foreach ($this->collFeatureProducts as $o) {
                     $o->clearAllReferences($deep);
                 }
             }
@@ -1845,10 +1903,10 @@ abstract class FeatureAv implements ActiveRecordInterface
         $this->currentLocale = 'en_US';
         $this->currentTranslations = null;
 
-        if ($this->collFeatureProds instanceof Collection) {
+        if ($this->collFeatureProducts instanceof Collection) {
-            $this->collFeatureProds->clearIterator();
+            $this->collFeatureProducts->clearIterator();
         }
-        $this->collFeatureProds = null;
+        $this->collFeatureProducts = null;
         if ($this->collFeatureAvI18ns instanceof Collection) {
             $this->collFeatureAvI18ns->clearIterator();
         }

core/lib/Thelia/Model/Base/FeatureAvQuery.php

@@ -24,11 +24,13 @@ use Thelia\Model\Map\FeatureAvTableMap;
  *
  * @method     ChildFeatureAvQuery orderById($order = Criteria::ASC) Order by the id column
  * @method     ChildFeatureAvQuery orderByFeatureId($order = Criteria::ASC) Order by the feature_id column
+ * @method     ChildFeatureAvQuery orderByPosition($order = Criteria::ASC) Order by the position column
  * @method     ChildFeatureAvQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
  * @method     ChildFeatureAvQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
  *
  * @method     ChildFeatureAvQuery groupById() Group by the id column
  * @method     ChildFeatureAvQuery groupByFeatureId() Group by the feature_id column
+ * @method     ChildFeatureAvQuery groupByPosition() Group by the position column
  * @method     ChildFeatureAvQuery groupByCreatedAt() Group by the created_at column
  * @method     ChildFeatureAvQuery groupByUpdatedAt() Group by the updated_at column
  *
@@ -40,9 +42,9 @@ use Thelia\Model\Map\FeatureAvTableMap;
  * @method     ChildFeatureAvQuery rightJoinFeature($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Feature relation
  * @method     ChildFeatureAvQuery innerJoinFeature($relationAlias = null) Adds a INNER JOIN clause to the query using the Feature relation
  *
- * @method     ChildFeatureAvQuery leftJoinFeatureProd($relationAlias = null) Adds a LEFT JOIN clause to the query using the FeatureProd relation
+ * @method     ChildFeatureAvQuery leftJoinFeatureProduct($relationAlias = null) Adds a LEFT JOIN clause to the query using the FeatureProduct relation
- * @method     ChildFeatureAvQuery rightJoinFeatureProd($relationAlias = null) Adds a RIGHT JOIN clause to the query using the FeatureProd relation
+ * @method     ChildFeatureAvQuery rightJoinFeatureProduct($relationAlias = null) Adds a RIGHT JOIN clause to the query using the FeatureProduct relation
- * @method     ChildFeatureAvQuery innerJoinFeatureProd($relationAlias = null) Adds a INNER JOIN clause to the query using the FeatureProd relation
+ * @method     ChildFeatureAvQuery innerJoinFeatureProduct($relationAlias = null) Adds a INNER JOIN clause to the query using the FeatureProduct relation
  *
  * @method     ChildFeatureAvQuery leftJoinFeatureAvI18n($relationAlias = null) Adds a LEFT JOIN clause to the query using the FeatureAvI18n relation
  * @method     ChildFeatureAvQuery rightJoinFeatureAvI18n($relationAlias = null) Adds a RIGHT JOIN clause to the query using the FeatureAvI18n relation
@@ -53,11 +55,13 @@ use Thelia\Model\Map\FeatureAvTableMap;
  *
  * @method     ChildFeatureAv findOneById(int $id) Return the first ChildFeatureAv filtered by the id column
  * @method     ChildFeatureAv findOneByFeatureId(int $feature_id) Return the first ChildFeatureAv filtered by the feature_id column
+ * @method     ChildFeatureAv findOneByPosition(int $position) Return the first ChildFeatureAv filtered by the position column
  * @method     ChildFeatureAv findOneByCreatedAt(string $created_at) Return the first ChildFeatureAv filtered by the created_at column
  * @method     ChildFeatureAv findOneByUpdatedAt(string $updated_at) Return the first ChildFeatureAv filtered by the updated_at column
  *
  * @method     array findById(int $id) Return ChildFeatureAv objects filtered by the id column
  * @method     array findByFeatureId(int $feature_id) Return ChildFeatureAv objects filtered by the feature_id column
+ * @method     array findByPosition(int $position) Return ChildFeatureAv objects filtered by the position column
  * @method     array findByCreatedAt(string $created_at) Return ChildFeatureAv objects filtered by the created_at column
  * @method     array findByUpdatedAt(string $updated_at) Return ChildFeatureAv objects filtered by the updated_at column
  *
@@ -148,7 +152,7 @@ abstract class FeatureAvQuery extends ModelCriteria
      */
     protected function findPkSimple($key, $con)
     {
-        $sql = 'SELECT ID, FEATURE_ID, CREATED_AT, UPDATED_AT FROM feature_av WHERE ID = :p0';
+        $sql = 'SELECT ID, FEATURE_ID, POSITION, CREATED_AT, UPDATED_AT FROM feature_av WHERE ID = :p0';
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -321,6 +325,47 @@ abstract class FeatureAvQuery extends ModelCriteria
         return $this->addUsingAlias(FeatureAvTableMap::FEATURE_ID, $featureId, $comparison);
     }
 
+    /**
+     * Filter the query on the position column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByPosition(1234); // WHERE position = 1234
+     * $query->filterByPosition(array(12, 34)); // WHERE position IN (12, 34)
+     * $query->filterByPosition(array('min' => 12)); // WHERE position > 12
+     * </code>
+     *
+     * @param     mixed $position The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildFeatureAvQuery The current query, for fluid interface
+     */
+    public function filterByPosition($position = null, $comparison = null)
+    {
+        if (is_array($position)) {
+            $useMinMax = false;
+            if (isset($position['min'])) {
+                $this->addUsingAlias(FeatureAvTableMap::POSITION, $position['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($position['max'])) {
+                $this->addUsingAlias(FeatureAvTableMap::POSITION, $position['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(FeatureAvTableMap::POSITION, $position, $comparison);
+    }
+
     /**
      * Filter the query on the created_at column
      *
@@ -483,40 +528,40 @@ abstract class FeatureAvQuery extends ModelCriteria
     }
 
     /**
-     * Filter the query by a related \Thelia\Model\FeatureProd object
+     * Filter the query by a related \Thelia\Model\FeatureProduct object
      *
-     * @param \Thelia\Model\FeatureProd|ObjectCollection $featureProd  the related object to use as filter
+     * @param \Thelia\Model\FeatureProduct|ObjectCollection $featureProduct  the related object to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildFeatureAvQuery The current query, for fluid interface
      */
-    public function filterByFeatureProd($featureProd, $comparison = null)
+    public function filterByFeatureProduct($featureProduct, $comparison = null)
     {
-        if ($featureProd instanceof \Thelia\Model\FeatureProd) {
+        if ($featureProduct instanceof \Thelia\Model\FeatureProduct) {
             return $this
-                ->addUsingAlias(FeatureAvTableMap::ID, $featureProd->getFeatureAvId(), $comparison);
+                ->addUsingAlias(FeatureAvTableMap::ID, $featureProduct->getFeatureAvId(), $comparison);
-        } elseif ($featureProd instanceof ObjectCollection) {
+        } elseif ($featureProduct instanceof ObjectCollection) {
             return $this
-                ->useFeatureProdQuery()
+                ->useFeatureProductQuery()
-                ->filterByPrimaryKeys($featureProd->getPrimaryKeys())
+                ->filterByPrimaryKeys($featureProduct->getPrimaryKeys())
                 ->endUse();
         } else {
-            throw new PropelException('filterByFeatureProd() only accepts arguments of type \Thelia\Model\FeatureProd or Collection');
+            throw new PropelException('filterByFeatureProduct() only accepts arguments of type \Thelia\Model\FeatureProduct or Collection');
         }
     }
 
     /**
-     * Adds a JOIN clause to the query using the FeatureProd relation
+     * Adds a JOIN clause to the query using the FeatureProduct relation
      *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildFeatureAvQuery The current query, for fluid interface
      */
-    public function joinFeatureProd($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    public function joinFeatureProduct($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
         $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('FeatureProd');
+        $relationMap = $tableMap->getRelation('FeatureProduct');
 
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -531,14 +576,14 @@ abstract class FeatureAvQuery extends ModelCriteria
             $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
             $this->addJoinObject($join, $relationAlias);
         } else {
-            $this->addJoinObject($join, 'FeatureProd');
+            $this->addJoinObject($join, 'FeatureProduct');
         }
 
         return $this;
     }
 
     /**
-     * Use the FeatureProd relation FeatureProd object
+     * Use the FeatureProduct relation FeatureProduct object
      *
      * @see useQuery()
      *
@@ -546,13 +591,13 @@ abstract class FeatureAvQuery extends ModelCriteria
      *                                   to be used as main alias in the secondary query
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return   \Thelia\Model\FeatureProdQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\FeatureProductQuery A secondary query class using the current class as primary query
      */
-    public function useFeatureProdQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    public function useFeatureProductQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
         return $this
-            ->joinFeatureProd($relationAlias, $joinType)
+            ->joinFeatureProduct($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'FeatureProd', '\Thelia\Model\FeatureProdQuery');
+            ->useQuery($relationAlias ? $relationAlias : 'FeatureProduct', '\Thelia\Model\FeatureProductQuery');
     }
 
     /**

core/lib/Thelia/Model/Base/FeatureProduct.php

@@ -19,19 +19,19 @@ use Propel\Runtime\Util\PropelDateTime;
 use Thelia\Model\Feature as ChildFeature;
 use Thelia\Model\FeatureAv as ChildFeatureAv;
 use Thelia\Model\FeatureAvQuery as ChildFeatureAvQuery;
-use Thelia\Model\FeatureProd as ChildFeatureProd;
+use Thelia\Model\FeatureProduct as ChildFeatureProduct;
-use Thelia\Model\FeatureProdQuery as ChildFeatureProdQuery;
+use Thelia\Model\FeatureProductQuery as ChildFeatureProductQuery;
 use Thelia\Model\FeatureQuery as ChildFeatureQuery;
 use Thelia\Model\Product as ChildProduct;
 use Thelia\Model\ProductQuery as ChildProductQuery;
-use Thelia\Model\Map\FeatureProdTableMap;
+use Thelia\Model\Map\FeatureProductTableMap;
 
-abstract class FeatureProd implements ActiveRecordInterface
+abstract class FeatureProduct implements ActiveRecordInterface
 {
     /**
      * TableMap class name
      */
-    const TABLE_MAP = '\\Thelia\\Model\\Map\\FeatureProdTableMap';
+    const TABLE_MAP = '\\Thelia\\Model\\Map\\FeatureProductTableMap';
 
 
     /**
@@ -132,7 +132,7 @@ abstract class FeatureProd implements ActiveRecordInterface
     protected $alreadyInSave = false;
 
     /**
-     * Initializes internal state of Thelia\Model\Base\FeatureProd object.
+     * Initializes internal state of Thelia\Model\Base\FeatureProduct object.
      */
     public function __construct()
     {
@@ -227,9 +227,9 @@ abstract class FeatureProd implements ActiveRecordInterface
     }
 
     /**
-     * Compares this with another <code>FeatureProd</code> instance.  If
+     * Compares this with another <code>FeatureProduct</code> instance.  If
-     * <code>obj</code> is an instance of <code>FeatureProd</code>, delegates to
+     * <code>obj</code> is an instance of <code>FeatureProduct</code>, delegates to
-     * <code>equals(FeatureProd)</code>.  Otherwise, returns <code>false</code>.
+     * <code>equals(FeatureProduct)</code>.  Otherwise, returns <code>false</code>.
      *
      * @param      obj The object to compare to.
      * @return Whether equal to the object specified.
@@ -310,7 +310,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      * @param string $name  The virtual column name
      * @param mixed  $value The value to give to the virtual column
      *
-     * @return FeatureProd The current object, for fluid interface
+     * @return FeatureProduct The current object, for fluid interface
      */
     public function setVirtualColumn($name, $value)
     {
@@ -342,7 +342,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
      * @param string $data The source data to import from
      *
-     * @return FeatureProd The current object, for fluid interface
+     * @return FeatureProduct The current object, for fluid interface
      */
     public function importFrom($parser, $data)
     {
@@ -495,7 +495,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      * Set the value of [id] column.
      *
      * @param      int $v new value
-     * @return   \Thelia\Model\FeatureProd The current object (for fluent API support)
+     * @return   \Thelia\Model\FeatureProduct The current object (for fluent API support)
      */
     public function setId($v)
     {
@@ -505,7 +505,7 @@ abstract class FeatureProd implements ActiveRecordInterface
 
         if ($this->id !== $v) {
             $this->id = $v;
-            $this->modifiedColumns[] = FeatureProdTableMap::ID;
+            $this->modifiedColumns[] = FeatureProductTableMap::ID;
         }
 
 
@@ -516,7 +516,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      * Set the value of [product_id] column.
      *
      * @param      int $v new value
-     * @return   \Thelia\Model\FeatureProd The current object (for fluent API support)
+     * @return   \Thelia\Model\FeatureProduct The current object (for fluent API support)
      */
     public function setProductId($v)
     {
@@ -526,7 +526,7 @@ abstract class FeatureProd implements ActiveRecordInterface
 
         if ($this->product_id !== $v) {
             $this->product_id = $v;
-            $this->modifiedColumns[] = FeatureProdTableMap::PRODUCT_ID;
+            $this->modifiedColumns[] = FeatureProductTableMap::PRODUCT_ID;
         }
 
         if ($this->aProduct !== null && $this->aProduct->getId() !== $v) {
@@ -541,7 +541,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      * Set the value of [feature_id] column.
      *
      * @param      int $v new value
-     * @return   \Thelia\Model\FeatureProd The current object (for fluent API support)
+     * @return   \Thelia\Model\FeatureProduct The current object (for fluent API support)
      */
     public function setFeatureId($v)
     {
@@ -551,7 +551,7 @@ abstract class FeatureProd implements ActiveRecordInterface
 
         if ($this->feature_id !== $v) {
             $this->feature_id = $v;
-            $this->modifiedColumns[] = FeatureProdTableMap::FEATURE_ID;
+            $this->modifiedColumns[] = FeatureProductTableMap::FEATURE_ID;
         }
 
         if ($this->aFeature !== null && $this->aFeature->getId() !== $v) {
@@ -566,7 +566,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      * Set the value of [feature_av_id] column.
      *
      * @param      int $v new value
-     * @return   \Thelia\Model\FeatureProd The current object (for fluent API support)
+     * @return   \Thelia\Model\FeatureProduct The current object (for fluent API support)
      */
     public function setFeatureAvId($v)
     {
@@ -576,7 +576,7 @@ abstract class FeatureProd implements ActiveRecordInterface
 
         if ($this->feature_av_id !== $v) {
             $this->feature_av_id = $v;
-            $this->modifiedColumns[] = FeatureProdTableMap::FEATURE_AV_ID;
+            $this->modifiedColumns[] = FeatureProductTableMap::FEATURE_AV_ID;
         }
 
         if ($this->aFeatureAv !== null && $this->aFeatureAv->getId() !== $v) {
@@ -591,7 +591,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      * Set the value of [by_default] column.
      *
      * @param      string $v new value
-     * @return   \Thelia\Model\FeatureProd The current object (for fluent API support)
+     * @return   \Thelia\Model\FeatureProduct The current object (for fluent API support)
      */
     public function setByDefault($v)
     {
@@ -601,7 +601,7 @@ abstract class FeatureProd implements ActiveRecordInterface
 
         if ($this->by_default !== $v) {
             $this->by_default = $v;
-            $this->modifiedColumns[] = FeatureProdTableMap::BY_DEFAULT;
+            $this->modifiedColumns[] = FeatureProductTableMap::BY_DEFAULT;
         }
 
 
@@ -612,7 +612,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      * Set the value of [position] column.
      *
      * @param      int $v new value
-     * @return   \Thelia\Model\FeatureProd The current object (for fluent API support)
+     * @return   \Thelia\Model\FeatureProduct The current object (for fluent API support)
      */
     public function setPosition($v)
     {
@@ -622,7 +622,7 @@ abstract class FeatureProd implements ActiveRecordInterface
 
         if ($this->position !== $v) {
             $this->position = $v;
-            $this->modifiedColumns[] = FeatureProdTableMap::POSITION;
+            $this->modifiedColumns[] = FeatureProductTableMap::POSITION;
         }
 
 
@@ -634,7 +634,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      *
      * @param      mixed $v string, integer (timestamp), or \DateTime value.
      *               Empty strings are treated as NULL.
-     * @return   \Thelia\Model\FeatureProd The current object (for fluent API support)
+     * @return   \Thelia\Model\FeatureProduct The current object (for fluent API support)
      */
     public function setCreatedAt($v)
     {
@@ -642,7 +642,7 @@ abstract class FeatureProd implements ActiveRecordInterface
         if ($this->created_at !== null || $dt !== null) {
             if ($dt !== $this->created_at) {
                 $this->created_at = $dt;
-                $this->modifiedColumns[] = FeatureProdTableMap::CREATED_AT;
+                $this->modifiedColumns[] = FeatureProductTableMap::CREATED_AT;
             }
         } // if either are not null
 
@@ -655,7 +655,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      *
      * @param      mixed $v string, integer (timestamp), or \DateTime value.
      *               Empty strings are treated as NULL.
-     * @return   \Thelia\Model\FeatureProd The current object (for fluent API support)
+     * @return   \Thelia\Model\FeatureProduct The current object (for fluent API support)
      */
     public function setUpdatedAt($v)
     {
@@ -663,7 +663,7 @@ abstract class FeatureProd implements ActiveRecordInterface
         if ($this->updated_at !== null || $dt !== null) {
             if ($dt !== $this->updated_at) {
                 $this->updated_at = $dt;
-                $this->modifiedColumns[] = FeatureProdTableMap::UPDATED_AT;
+                $this->modifiedColumns[] = FeatureProductTableMap::UPDATED_AT;
             }
         } // if either are not null
 
@@ -708,31 +708,31 @@ abstract class FeatureProd implements ActiveRecordInterface
         try {
 
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : FeatureProdTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : FeatureProductTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
             $this->id = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : FeatureProdTableMap::translateFieldName('ProductId', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : FeatureProductTableMap::translateFieldName('ProductId', TableMap::TYPE_PHPNAME, $indexType)];
             $this->product_id = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : FeatureProdTableMap::translateFieldName('FeatureId', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : FeatureProductTableMap::translateFieldName('FeatureId', TableMap::TYPE_PHPNAME, $indexType)];
             $this->feature_id = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : FeatureProdTableMap::translateFieldName('FeatureAvId', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : FeatureProductTableMap::translateFieldName('FeatureAvId', TableMap::TYPE_PHPNAME, $indexType)];
             $this->feature_av_id = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : FeatureProdTableMap::translateFieldName('ByDefault', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : FeatureProductTableMap::translateFieldName('ByDefault', TableMap::TYPE_PHPNAME, $indexType)];
             $this->by_default = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : FeatureProdTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : FeatureProductTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)];
             $this->position = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : FeatureProdTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : FeatureProductTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
             $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : FeatureProdTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : FeatureProductTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
@@ -745,10 +745,10 @@ abstract class FeatureProd implements ActiveRecordInterface
                 $this->ensureConsistency();
             }
 
-            return $startcol + 8; // 8 = FeatureProdTableMap::NUM_HYDRATE_COLUMNS.
+            return $startcol + 8; // 8 = FeatureProductTableMap::NUM_HYDRATE_COLUMNS.
 
         } catch (Exception $e) {
-            throw new PropelException("Error populating \Thelia\Model\FeatureProd object", 0, $e);
+            throw new PropelException("Error populating \Thelia\Model\FeatureProduct object", 0, $e);
         }
     }
 
@@ -799,13 +799,13 @@ abstract class FeatureProd implements ActiveRecordInterface
         }
 
         if ($con === null) {
-            $con = Propel::getServiceContainer()->getReadConnection(FeatureProdTableMap::DATABASE_NAME);
+            $con = Propel::getServiceContainer()->getReadConnection(FeatureProductTableMap::DATABASE_NAME);
         }
 
         // We don't need to alter the object instance pool; we're just modifying this instance
         // already in the pool.
 
-        $dataFetcher = ChildFeatureProdQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con);
+        $dataFetcher = ChildFeatureProductQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con);
         $row = $dataFetcher->fetch();
         $dataFetcher->close();
         if (!$row) {
@@ -827,8 +827,8 @@ abstract class FeatureProd implements ActiveRecordInterface
      * @param      ConnectionInterface $con
      * @return void
      * @throws PropelException
-     * @see FeatureProd::setDeleted()
+     * @see FeatureProduct::setDeleted()
-     * @see FeatureProd::isDeleted()
+     * @see FeatureProduct::isDeleted()
      */
     public function delete(ConnectionInterface $con = null)
     {
@@ -837,12 +837,12 @@ abstract class FeatureProd implements ActiveRecordInterface
         }
 
         if ($con === null) {
-            $con = Propel::getServiceContainer()->getWriteConnection(FeatureProdTableMap::DATABASE_NAME);
+            $con = Propel::getServiceContainer()->getWriteConnection(FeatureProductTableMap::DATABASE_NAME);
         }
 
         $con->beginTransaction();
         try {
-            $deleteQuery = ChildFeatureProdQuery::create()
+            $deleteQuery = ChildFeatureProductQuery::create()
                 ->filterByPrimaryKey($this->getPrimaryKey());
             $ret = $this->preDelete($con);
             if ($ret) {
@@ -879,7 +879,7 @@ abstract class FeatureProd implements ActiveRecordInterface
         }
 
         if ($con === null) {
-            $con = Propel::getServiceContainer()->getWriteConnection(FeatureProdTableMap::DATABASE_NAME);
+            $con = Propel::getServiceContainer()->getWriteConnection(FeatureProductTableMap::DATABASE_NAME);
         }
 
         $con->beginTransaction();
@@ -889,16 +889,16 @@ abstract class FeatureProd implements ActiveRecordInterface
             if ($isInsert) {
                 $ret = $ret && $this->preInsert($con);
                 // timestampable behavior
-                if (!$this->isColumnModified(FeatureProdTableMap::CREATED_AT)) {
+                if (!$this->isColumnModified(FeatureProductTableMap::CREATED_AT)) {
                     $this->setCreatedAt(time());
                 }
-                if (!$this->isColumnModified(FeatureProdTableMap::UPDATED_AT)) {
+                if (!$this->isColumnModified(FeatureProductTableMap::UPDATED_AT)) {
                     $this->setUpdatedAt(time());
                 }
             } else {
                 $ret = $ret && $this->preUpdate($con);
                 // timestampable behavior
-                if ($this->isModified() && !$this->isColumnModified(FeatureProdTableMap::UPDATED_AT)) {
+                if ($this->isModified() && !$this->isColumnModified(FeatureProductTableMap::UPDATED_AT)) {
                     $this->setUpdatedAt(time());
                 }
             }
@@ -910,7 +910,7 @@ abstract class FeatureProd implements ActiveRecordInterface
                     $this->postUpdate($con);
                 }
                 $this->postSave($con);
-                FeatureProdTableMap::addInstanceToPool($this);
+                FeatureProductTableMap::addInstanceToPool($this);
             } else {
                 $affectedRows = 0;
             }
@@ -997,39 +997,39 @@ abstract class FeatureProd implements ActiveRecordInterface
         $modifiedColumns = array();
         $index = 0;
 
-        $this->modifiedColumns[] = FeatureProdTableMap::ID;
+        $this->modifiedColumns[] = FeatureProductTableMap::ID;
         if (null !== $this->id) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key (' . FeatureProdTableMap::ID . ')');
+            throw new PropelException('Cannot insert a value for auto-increment primary key (' . FeatureProductTableMap::ID . ')');
         }
 
          // check the columns in natural order for more readable SQL queries
-        if ($this->isColumnModified(FeatureProdTableMap::ID)) {
+        if ($this->isColumnModified(FeatureProductTableMap::ID)) {
             $modifiedColumns[':p' . $index++]  = 'ID';
         }
-        if ($this->isColumnModified(FeatureProdTableMap::PRODUCT_ID)) {
+        if ($this->isColumnModified(FeatureProductTableMap::PRODUCT_ID)) {
             $modifiedColumns[':p' . $index++]  = 'PRODUCT_ID';
         }
-        if ($this->isColumnModified(FeatureProdTableMap::FEATURE_ID)) {
+        if ($this->isColumnModified(FeatureProductTableMap::FEATURE_ID)) {
             $modifiedColumns[':p' . $index++]  = 'FEATURE_ID';
         }
-        if ($this->isColumnModified(FeatureProdTableMap::FEATURE_AV_ID)) {
+        if ($this->isColumnModified(FeatureProductTableMap::FEATURE_AV_ID)) {
             $modifiedColumns[':p' . $index++]  = 'FEATURE_AV_ID';
         }
-        if ($this->isColumnModified(FeatureProdTableMap::BY_DEFAULT)) {
+        if ($this->isColumnModified(FeatureProductTableMap::BY_DEFAULT)) {
             $modifiedColumns[':p' . $index++]  = 'BY_DEFAULT';
         }
-        if ($this->isColumnModified(FeatureProdTableMap::POSITION)) {
+        if ($this->isColumnModified(FeatureProductTableMap::POSITION)) {
             $modifiedColumns[':p' . $index++]  = 'POSITION';
         }
-        if ($this->isColumnModified(FeatureProdTableMap::CREATED_AT)) {
+        if ($this->isColumnModified(FeatureProductTableMap::CREATED_AT)) {
             $modifiedColumns[':p' . $index++]  = 'CREATED_AT';
         }
-        if ($this->isColumnModified(FeatureProdTableMap::UPDATED_AT)) {
+        if ($this->isColumnModified(FeatureProductTableMap::UPDATED_AT)) {
             $modifiedColumns[':p' . $index++]  = 'UPDATED_AT';
         }
 
         $sql = sprintf(
-            'INSERT INTO feature_prod (%s) VALUES (%s)',
+            'INSERT INTO feature_product (%s) VALUES (%s)',
             implode(', ', $modifiedColumns),
             implode(', ', array_keys($modifiedColumns))
         );
@@ -1108,7 +1108,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      */
     public function getByName($name, $type = TableMap::TYPE_PHPNAME)
     {
-        $pos = FeatureProdTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
+        $pos = FeatureProductTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
         $field = $this->getByPosition($pos);
 
         return $field;
@@ -1171,11 +1171,11 @@ abstract class FeatureProd implements ActiveRecordInterface
      */
     public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false)
     {
-        if (isset($alreadyDumpedObjects['FeatureProd'][$this->getPrimaryKey()])) {
+        if (isset($alreadyDumpedObjects['FeatureProduct'][$this->getPrimaryKey()])) {
             return '*RECURSION*';
         }
-        $alreadyDumpedObjects['FeatureProd'][$this->getPrimaryKey()] = true;
+        $alreadyDumpedObjects['FeatureProduct'][$this->getPrimaryKey()] = true;
-        $keys = FeatureProdTableMap::getFieldNames($keyType);
+        $keys = FeatureProductTableMap::getFieldNames($keyType);
         $result = array(
             $keys[0] => $this->getId(),
             $keys[1] => $this->getProductId(),
@@ -1220,7 +1220,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      */
     public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
     {
-        $pos = FeatureProdTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
+        $pos = FeatureProductTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
 
         return $this->setByPosition($pos, $value);
     }
@@ -1282,7 +1282,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      */
     public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
     {
-        $keys = FeatureProdTableMap::getFieldNames($keyType);
+        $keys = FeatureProductTableMap::getFieldNames($keyType);
 
         if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
         if (array_key_exists($keys[1], $arr)) $this->setProductId($arr[$keys[1]]);
@@ -1301,16 +1301,16 @@ abstract class FeatureProd implements ActiveRecordInterface
      */
     public function buildCriteria()
     {
-        $criteria = new Criteria(FeatureProdTableMap::DATABASE_NAME);
+        $criteria = new Criteria(FeatureProductTableMap::DATABASE_NAME);
 
-        if ($this->isColumnModified(FeatureProdTableMap::ID)) $criteria->add(FeatureProdTableMap::ID, $this->id);
+        if ($this->isColumnModified(FeatureProductTableMap::ID)) $criteria->add(FeatureProductTableMap::ID, $this->id);
-        if ($this->isColumnModified(FeatureProdTableMap::PRODUCT_ID)) $criteria->add(FeatureProdTableMap::PRODUCT_ID, $this->product_id);
+        if ($this->isColumnModified(FeatureProductTableMap::PRODUCT_ID)) $criteria->add(FeatureProductTableMap::PRODUCT_ID, $this->product_id);
-        if ($this->isColumnModified(FeatureProdTableMap::FEATURE_ID)) $criteria->add(FeatureProdTableMap::FEATURE_ID, $this->feature_id);
+        if ($this->isColumnModified(FeatureProductTableMap::FEATURE_ID)) $criteria->add(FeatureProductTableMap::FEATURE_ID, $this->feature_id);
-        if ($this->isColumnModified(FeatureProdTableMap::FEATURE_AV_ID)) $criteria->add(FeatureProdTableMap::FEATURE_AV_ID, $this->feature_av_id);
+        if ($this->isColumnModified(FeatureProductTableMap::FEATURE_AV_ID)) $criteria->add(FeatureProductTableMap::FEATURE_AV_ID, $this->feature_av_id);
-        if ($this->isColumnModified(FeatureProdTableMap::BY_DEFAULT)) $criteria->add(FeatureProdTableMap::BY_DEFAULT, $this->by_default);
+        if ($this->isColumnModified(FeatureProductTableMap::BY_DEFAULT)) $criteria->add(FeatureProductTableMap::BY_DEFAULT, $this->by_default);
-        if ($this->isColumnModified(FeatureProdTableMap::POSITION)) $criteria->add(FeatureProdTableMap::POSITION, $this->position);
+        if ($this->isColumnModified(FeatureProductTableMap::POSITION)) $criteria->add(FeatureProductTableMap::POSITION, $this->position);
-        if ($this->isColumnModified(FeatureProdTableMap::CREATED_AT)) $criteria->add(FeatureProdTableMap::CREATED_AT, $this->created_at);
+        if ($this->isColumnModified(FeatureProductTableMap::CREATED_AT)) $criteria->add(FeatureProductTableMap::CREATED_AT, $this->created_at);
-        if ($this->isColumnModified(FeatureProdTableMap::UPDATED_AT)) $criteria->add(FeatureProdTableMap::UPDATED_AT, $this->updated_at);
+        if ($this->isColumnModified(FeatureProductTableMap::UPDATED_AT)) $criteria->add(FeatureProductTableMap::UPDATED_AT, $this->updated_at);
 
         return $criteria;
     }
@@ -1325,8 +1325,8 @@ abstract class FeatureProd implements ActiveRecordInterface
      */
     public function buildPkeyCriteria()
     {
-        $criteria = new Criteria(FeatureProdTableMap::DATABASE_NAME);
+        $criteria = new Criteria(FeatureProductTableMap::DATABASE_NAME);
-        $criteria->add(FeatureProdTableMap::ID, $this->id);
+        $criteria->add(FeatureProductTableMap::ID, $this->id);
 
         return $criteria;
     }
@@ -1367,7 +1367,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param      object $copyObj An object of \Thelia\Model\FeatureProd (or compatible) type.
+     * @param      object $copyObj An object of \Thelia\Model\FeatureProduct (or compatible) type.
      * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
      * @param      boolean $makeNew Whether to reset autoincrement PKs and make the object new.
      * @throws PropelException
@@ -1396,7 +1396,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      * objects.
      *
      * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @return                 \Thelia\Model\FeatureProd Clone of current object.
+     * @return                 \Thelia\Model\FeatureProduct Clone of current object.
      * @throws PropelException
      */
     public function copy($deepCopy = false)
@@ -1413,7 +1413,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      * Declares an association between this object and a ChildProduct object.
      *
      * @param                  ChildProduct $v
-     * @return                 \Thelia\Model\FeatureProd The current object (for fluent API support)
+     * @return                 \Thelia\Model\FeatureProduct The current object (for fluent API support)
      * @throws PropelException
      */
     public function setProduct(ChildProduct $v = null)
@@ -1429,7 +1429,7 @@ abstract class FeatureProd implements ActiveRecordInterface
         // Add binding for other direction of this n:n relationship.
         // If this object has already been added to the ChildProduct object, it will not be re-added.
         if ($v !== null) {
-            $v->addFeatureProd($this);
+            $v->addFeatureProduct($this);
         }
 
 
@@ -1453,7 +1453,7 @@ abstract class FeatureProd implements ActiveRecordInterface
                 to this object.  This level of coupling may, however, be
                 undesirable since it could result in an only partially populated collection
                 in the referenced object.
-                $this->aProduct->addFeatureProds($this);
+                $this->aProduct->addFeatureProducts($this);
              */
         }
 
@@ -1464,7 +1464,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      * Declares an association between this object and a ChildFeature object.
      *
      * @param                  ChildFeature $v
-     * @return                 \Thelia\Model\FeatureProd The current object (for fluent API support)
+     * @return                 \Thelia\Model\FeatureProduct The current object (for fluent API support)
      * @throws PropelException
      */
     public function setFeature(ChildFeature $v = null)
@@ -1480,7 +1480,7 @@ abstract class FeatureProd implements ActiveRecordInterface
         // Add binding for other direction of this n:n relationship.
         // If this object has already been added to the ChildFeature object, it will not be re-added.
         if ($v !== null) {
-            $v->addFeatureProd($this);
+            $v->addFeatureProduct($this);
         }
 
 
@@ -1504,7 +1504,7 @@ abstract class FeatureProd implements ActiveRecordInterface
                 to this object.  This level of coupling may, however, be
                 undesirable since it could result in an only partially populated collection
                 in the referenced object.
-                $this->aFeature->addFeatureProds($this);
+                $this->aFeature->addFeatureProducts($this);
              */
         }
 
@@ -1515,7 +1515,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      * Declares an association between this object and a ChildFeatureAv object.
      *
      * @param                  ChildFeatureAv $v
-     * @return                 \Thelia\Model\FeatureProd The current object (for fluent API support)
+     * @return                 \Thelia\Model\FeatureProduct The current object (for fluent API support)
      * @throws PropelException
      */
     public function setFeatureAv(ChildFeatureAv $v = null)
@@ -1531,7 +1531,7 @@ abstract class FeatureProd implements ActiveRecordInterface
         // Add binding for other direction of this n:n relationship.
         // If this object has already been added to the ChildFeatureAv object, it will not be re-added.
         if ($v !== null) {
-            $v->addFeatureProd($this);
+            $v->addFeatureProduct($this);
         }
 
 
@@ -1555,7 +1555,7 @@ abstract class FeatureProd implements ActiveRecordInterface
                 to this object.  This level of coupling may, however, be
                 undesirable since it could result in an only partially populated collection
                 in the referenced object.
-                $this->aFeatureAv->addFeatureProds($this);
+                $this->aFeatureAv->addFeatureProducts($this);
              */
         }
 
@@ -1608,7 +1608,7 @@ abstract class FeatureProd implements ActiveRecordInterface
      */
     public function __toString()
     {
-        return (string) $this->exportTo(FeatureProdTableMap::DEFAULT_STRING_FORMAT);
+        return (string) $this->exportTo(FeatureProductTableMap::DEFAULT_STRING_FORMAT);
     }
 
     // timestampable behavior
@@ -1616,11 +1616,11 @@ abstract class FeatureProd implements ActiveRecordInterface
     /**
      * Mark the current object so that the update date doesn't get updated during next save
      *
-     * @return     ChildFeatureProd The current object (for fluent API support)
+     * @return     ChildFeatureProduct The current object (for fluent API support)
      */
     public function keepUpdateDateUnchanged()
     {
-        $this->modifiedColumns[] = FeatureProdTableMap::UPDATED_AT;
+        $this->modifiedColumns[] = FeatureProductTableMap::UPDATED_AT;
 
         return $this;
     }

core/lib/Thelia/Model/Base/FeatureProductQuery.php

@@ -12,100 +12,100 @@ use Propel\Runtime\Collection\Collection;
 use Propel\Runtime\Collection\ObjectCollection;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Propel\Runtime\Exception\PropelException;
-use Thelia\Model\FeatureProd as ChildFeatureProd;
+use Thelia\Model\FeatureProduct as ChildFeatureProduct;
-use Thelia\Model\FeatureProdQuery as ChildFeatureProdQuery;
+use Thelia\Model\FeatureProductQuery as ChildFeatureProductQuery;
-use Thelia\Model\Map\FeatureProdTableMap;
+use Thelia\Model\Map\FeatureProductTableMap;
 
 /**
- * Base class that represents a query for the 'feature_prod' table.
+ * Base class that represents a query for the 'feature_product' table.
  *
  *
  *
- * @method     ChildFeatureProdQuery orderById($order = Criteria::ASC) Order by the id column
+ * @method     ChildFeatureProductQuery orderById($order = Criteria::ASC) Order by the id column
- * @method     ChildFeatureProdQuery orderByProductId($order = Criteria::ASC) Order by the product_id column
+ * @method     ChildFeatureProductQuery orderByProductId($order = Criteria::ASC) Order by the product_id column
- * @method     ChildFeatureProdQuery orderByFeatureId($order = Criteria::ASC) Order by the feature_id column
+ * @method     ChildFeatureProductQuery orderByFeatureId($order = Criteria::ASC) Order by the feature_id column
- * @method     ChildFeatureProdQuery orderByFeatureAvId($order = Criteria::ASC) Order by the feature_av_id column
+ * @method     ChildFeatureProductQuery orderByFeatureAvId($order = Criteria::ASC) Order by the feature_av_id column
- * @method     ChildFeatureProdQuery orderByByDefault($order = Criteria::ASC) Order by the by_default column
+ * @method     ChildFeatureProductQuery orderByByDefault($order = Criteria::ASC) Order by the by_default column
- * @method     ChildFeatureProdQuery orderByPosition($order = Criteria::ASC) Order by the position column
+ * @method     ChildFeatureProductQuery orderByPosition($order = Criteria::ASC) Order by the position column
- * @method     ChildFeatureProdQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
+ * @method     ChildFeatureProductQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
- * @method     ChildFeatureProdQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
+ * @method     ChildFeatureProductQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
  *
- * @method     ChildFeatureProdQuery groupById() Group by the id column
+ * @method     ChildFeatureProductQuery groupById() Group by the id column
- * @method     ChildFeatureProdQuery groupByProductId() Group by the product_id column
+ * @method     ChildFeatureProductQuery groupByProductId() Group by the product_id column
- * @method     ChildFeatureProdQuery groupByFeatureId() Group by the feature_id column
+ * @method     ChildFeatureProductQuery groupByFeatureId() Group by the feature_id column
- * @method     ChildFeatureProdQuery groupByFeatureAvId() Group by the feature_av_id column
+ * @method     ChildFeatureProductQuery groupByFeatureAvId() Group by the feature_av_id column
- * @method     ChildFeatureProdQuery groupByByDefault() Group by the by_default column
+ * @method     ChildFeatureProductQuery groupByByDefault() Group by the by_default column
- * @method     ChildFeatureProdQuery groupByPosition() Group by the position column
+ * @method     ChildFeatureProductQuery groupByPosition() Group by the position column
- * @method     ChildFeatureProdQuery groupByCreatedAt() Group by the created_at column
+ * @method     ChildFeatureProductQuery groupByCreatedAt() Group by the created_at column
- * @method     ChildFeatureProdQuery groupByUpdatedAt() Group by the updated_at column
+ * @method     ChildFeatureProductQuery groupByUpdatedAt() Group by the updated_at column
  *
- * @method     ChildFeatureProdQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
+ * @method     ChildFeatureProductQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
- * @method     ChildFeatureProdQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
+ * @method     ChildFeatureProductQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
- * @method     ChildFeatureProdQuery innerJoin($relation) Adds a INNER JOIN clause to the query
+ * @method     ChildFeatureProductQuery innerJoin($relation) Adds a INNER JOIN clause to the query
  *
- * @method     ChildFeatureProdQuery leftJoinProduct($relationAlias = null) Adds a LEFT JOIN clause to the query using the Product relation
+ * @method     ChildFeatureProductQuery leftJoinProduct($relationAlias = null) Adds a LEFT JOIN clause to the query using the Product relation
- * @method     ChildFeatureProdQuery rightJoinProduct($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Product relation
+ * @method     ChildFeatureProductQuery rightJoinProduct($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Product relation
- * @method     ChildFeatureProdQuery innerJoinProduct($relationAlias = null) Adds a INNER JOIN clause to the query using the Product relation
+ * @method     ChildFeatureProductQuery innerJoinProduct($relationAlias = null) Adds a INNER JOIN clause to the query using the Product relation
  *
- * @method     ChildFeatureProdQuery leftJoinFeature($relationAlias = null) Adds a LEFT JOIN clause to the query using the Feature relation
+ * @method     ChildFeatureProductQuery leftJoinFeature($relationAlias = null) Adds a LEFT JOIN clause to the query using the Feature relation
- * @method     ChildFeatureProdQuery rightJoinFeature($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Feature relation
+ * @method     ChildFeatureProductQuery rightJoinFeature($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Feature relation
- * @method     ChildFeatureProdQuery innerJoinFeature($relationAlias = null) Adds a INNER JOIN clause to the query using the Feature relation
+ * @method     ChildFeatureProductQuery innerJoinFeature($relationAlias = null) Adds a INNER JOIN clause to the query using the Feature relation
  *
- * @method     ChildFeatureProdQuery leftJoinFeatureAv($relationAlias = null) Adds a LEFT JOIN clause to the query using the FeatureAv relation
+ * @method     ChildFeatureProductQuery leftJoinFeatureAv($relationAlias = null) Adds a LEFT JOIN clause to the query using the FeatureAv relation
- * @method     ChildFeatureProdQuery rightJoinFeatureAv($relationAlias = null) Adds a RIGHT JOIN clause to the query using the FeatureAv relation
+ * @method     ChildFeatureProductQuery rightJoinFeatureAv($relationAlias = null) Adds a RIGHT JOIN clause to the query using the FeatureAv relation
- * @method     ChildFeatureProdQuery innerJoinFeatureAv($relationAlias = null) Adds a INNER JOIN clause to the query using the FeatureAv relation
+ * @method     ChildFeatureProductQuery innerJoinFeatureAv($relationAlias = null) Adds a INNER JOIN clause to the query using the FeatureAv relation
  *
- * @method     ChildFeatureProd findOne(ConnectionInterface $con = null) Return the first ChildFeatureProd matching the query
+ * @method     ChildFeatureProduct findOne(ConnectionInterface $con = null) Return the first ChildFeatureProduct matching the query
- * @method     ChildFeatureProd findOneOrCreate(ConnectionInterface $con = null) Return the first ChildFeatureProd matching the query, or a new ChildFeatureProd object populated from the query conditions when no match is found
+ * @method     ChildFeatureProduct findOneOrCreate(ConnectionInterface $con = null) Return the first ChildFeatureProduct matching the query, or a new ChildFeatureProduct object populated from the query conditions when no match is found
  *
- * @method     ChildFeatureProd findOneById(int $id) Return the first ChildFeatureProd filtered by the id column
+ * @method     ChildFeatureProduct findOneById(int $id) Return the first ChildFeatureProduct filtered by the id column
- * @method     ChildFeatureProd findOneByProductId(int $product_id) Return the first ChildFeatureProd filtered by the product_id column
+ * @method     ChildFeatureProduct findOneByProductId(int $product_id) Return the first ChildFeatureProduct filtered by the product_id column
- * @method     ChildFeatureProd findOneByFeatureId(int $feature_id) Return the first ChildFeatureProd filtered by the feature_id column
+ * @method     ChildFeatureProduct findOneByFeatureId(int $feature_id) Return the first ChildFeatureProduct filtered by the feature_id column
- * @method     ChildFeatureProd findOneByFeatureAvId(int $feature_av_id) Return the first ChildFeatureProd filtered by the feature_av_id column
+ * @method     ChildFeatureProduct findOneByFeatureAvId(int $feature_av_id) Return the first ChildFeatureProduct filtered by the feature_av_id column
- * @method     ChildFeatureProd findOneByByDefault(string $by_default) Return the first ChildFeatureProd filtered by the by_default column
+ * @method     ChildFeatureProduct findOneByByDefault(string $by_default) Return the first ChildFeatureProduct filtered by the by_default column
- * @method     ChildFeatureProd findOneByPosition(int $position) Return the first ChildFeatureProd filtered by the position column
+ * @method     ChildFeatureProduct findOneByPosition(int $position) Return the first ChildFeatureProduct filtered by the position column
- * @method     ChildFeatureProd findOneByCreatedAt(string $created_at) Return the first ChildFeatureProd filtered by the created_at column
+ * @method     ChildFeatureProduct findOneByCreatedAt(string $created_at) Return the first ChildFeatureProduct filtered by the created_at column
- * @method     ChildFeatureProd findOneByUpdatedAt(string $updated_at) Return the first ChildFeatureProd filtered by the updated_at column
+ * @method     ChildFeatureProduct findOneByUpdatedAt(string $updated_at) Return the first ChildFeatureProduct filtered by the updated_at column
  *
- * @method     array findById(int $id) Return ChildFeatureProd objects filtered by the id column
+ * @method     array findById(int $id) Return ChildFeatureProduct objects filtered by the id column
- * @method     array findByProductId(int $product_id) Return ChildFeatureProd objects filtered by the product_id column
+ * @method     array findByProductId(int $product_id) Return ChildFeatureProduct objects filtered by the product_id column
- * @method     array findByFeatureId(int $feature_id) Return ChildFeatureProd objects filtered by the feature_id column
+ * @method     array findByFeatureId(int $feature_id) Return ChildFeatureProduct objects filtered by the feature_id column
- * @method     array findByFeatureAvId(int $feature_av_id) Return ChildFeatureProd objects filtered by the feature_av_id column
+ * @method     array findByFeatureAvId(int $feature_av_id) Return ChildFeatureProduct objects filtered by the feature_av_id column
- * @method     array findByByDefault(string $by_default) Return ChildFeatureProd objects filtered by the by_default column
+ * @method     array findByByDefault(string $by_default) Return ChildFeatureProduct objects filtered by the by_default column
- * @method     array findByPosition(int $position) Return ChildFeatureProd objects filtered by the position column
+ * @method     array findByPosition(int $position) Return ChildFeatureProduct objects filtered by the position column
- * @method     array findByCreatedAt(string $created_at) Return ChildFeatureProd objects filtered by the created_at column
+ * @method     array findByCreatedAt(string $created_at) Return ChildFeatureProduct objects filtered by the created_at column
- * @method     array findByUpdatedAt(string $updated_at) Return ChildFeatureProd objects filtered by the updated_at column
+ * @method     array findByUpdatedAt(string $updated_at) Return ChildFeatureProduct objects filtered by the updated_at column
  *
  */
-abstract class FeatureProdQuery extends ModelCriteria
+abstract class FeatureProductQuery extends ModelCriteria
 {
 
     /**
-     * Initializes internal state of \Thelia\Model\Base\FeatureProdQuery object.
+     * Initializes internal state of \Thelia\Model\Base\FeatureProductQuery object.
      *
      * @param     string $dbName The database name
      * @param     string $modelName The phpName of a model, e.g. 'Book'
      * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
      */
-    public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\FeatureProd', $modelAlias = null)
+    public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\FeatureProduct', $modelAlias = null)
     {
         parent::__construct($dbName, $modelName, $modelAlias);
     }
 
     /**
-     * Returns a new ChildFeatureProdQuery object.
+     * Returns a new ChildFeatureProductQuery object.
      *
      * @param     string $modelAlias The alias of a model in the query
      * @param     Criteria $criteria Optional Criteria to build the query from
      *
-     * @return ChildFeatureProdQuery
+     * @return ChildFeatureProductQuery
      */
     public static function create($modelAlias = null, $criteria = null)
     {
-        if ($criteria instanceof \Thelia\Model\FeatureProdQuery) {
+        if ($criteria instanceof \Thelia\Model\FeatureProductQuery) {
             return $criteria;
         }
-        $query = new \Thelia\Model\FeatureProdQuery();
+        $query = new \Thelia\Model\FeatureProductQuery();
         if (null !== $modelAlias) {
             $query->setModelAlias($modelAlias);
         }
@@ -128,19 +128,19 @@ abstract class FeatureProdQuery extends ModelCriteria
      * @param mixed $key Primary key to use for the query
      * @param ConnectionInterface $con an optional connection object
      *
-     * @return ChildFeatureProd|array|mixed the result, formatted by the current formatter
+     * @return ChildFeatureProduct|array|mixed the result, formatted by the current formatter
      */
     public function findPk($key, $con = null)
     {
         if ($key === null) {
             return null;
         }
-        if ((null !== ($obj = FeatureProdTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
+        if ((null !== ($obj = FeatureProductTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
             // the object is already in the instance pool
             return $obj;
         }
         if ($con === null) {
-            $con = Propel::getServiceContainer()->getReadConnection(FeatureProdTableMap::DATABASE_NAME);
+            $con = Propel::getServiceContainer()->getReadConnection(FeatureProductTableMap::DATABASE_NAME);
         }
         $this->basePreSelect($con);
         if ($this->formatter || $this->modelAlias || $this->with || $this->select
@@ -159,11 +159,11 @@ abstract class FeatureProdQuery extends ModelCriteria
      * @param     mixed $key Primary key to use for the query
      * @param     ConnectionInterface $con A connection object
      *
-     * @return   ChildFeatureProd A model object, or null if the key is not found
+     * @return   ChildFeatureProduct A model object, or null if the key is not found
      */
     protected function findPkSimple($key, $con)
     {
-        $sql = 'SELECT ID, PRODUCT_ID, FEATURE_ID, FEATURE_AV_ID, BY_DEFAULT, POSITION, CREATED_AT, UPDATED_AT FROM feature_prod WHERE ID = :p0';
+        $sql = 'SELECT ID, PRODUCT_ID, FEATURE_ID, FEATURE_AV_ID, BY_DEFAULT, POSITION, CREATED_AT, UPDATED_AT FROM feature_product WHERE ID = :p0';
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -174,9 +174,9 @@ abstract class FeatureProdQuery extends ModelCriteria
         }
         $obj = null;
         if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
-            $obj = new ChildFeatureProd();
+            $obj = new ChildFeatureProduct();
             $obj->hydrate($row);
-            FeatureProdTableMap::addInstanceToPool($obj, (string) $key);
+            FeatureProductTableMap::addInstanceToPool($obj, (string) $key);
         }
         $stmt->closeCursor();
 
@@ -189,7 +189,7 @@ abstract class FeatureProdQuery extends ModelCriteria
      * @param     mixed $key Primary key to use for the query
      * @param     ConnectionInterface $con A connection object
      *
-     * @return ChildFeatureProd|array|mixed the result, formatted by the current formatter
+     * @return ChildFeatureProduct|array|mixed the result, formatted by the current formatter
      */
     protected function findPkComplex($key, $con)
     {
@@ -231,12 +231,12 @@ abstract class FeatureProdQuery extends ModelCriteria
      *
      * @param     mixed $key Primary key to use for the query
      *
-     * @return ChildFeatureProdQuery The current query, for fluid interface
+     * @return ChildFeatureProductQuery The current query, for fluid interface
      */
     public function filterByPrimaryKey($key)
     {
 
-        return $this->addUsingAlias(FeatureProdTableMap::ID, $key, Criteria::EQUAL);
+        return $this->addUsingAlias(FeatureProductTableMap::ID, $key, Criteria::EQUAL);
     }
 
     /**
@@ -244,12 +244,12 @@ abstract class FeatureProdQuery extends ModelCriteria
      *
      * @param     array $keys The list of primary key to use for the query
      *
-     * @return ChildFeatureProdQuery The current query, for fluid interface
+     * @return ChildFeatureProductQuery The current query, for fluid interface
      */
     public function filterByPrimaryKeys($keys)
     {
 
-        return $this->addUsingAlias(FeatureProdTableMap::ID, $keys, Criteria::IN);
+        return $this->addUsingAlias(FeatureProductTableMap::ID, $keys, Criteria::IN);
     }
 
     /**
@@ -268,18 +268,18 @@ abstract class FeatureProdQuery extends ModelCriteria
      *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
      * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
-     * @return ChildFeatureProdQuery The current query, for fluid interface
+     * @return ChildFeatureProductQuery The current query, for fluid interface
      */
     public function filterById($id = null, $comparison = null)
     {
         if (is_array($id)) {
             $useMinMax = false;
             if (isset($id['min'])) {
-                $this->addUsingAlias(FeatureProdTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
+                $this->addUsingAlias(FeatureProductTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
                 $useMinMax = true;
             }
             if (isset($id['max'])) {
-                $this->addUsingAlias(FeatureProdTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
+                $this->addUsingAlias(FeatureProductTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
                 $useMinMax = true;
             }
             if ($useMinMax) {
@@ -290,7 +290,7 @@ abstract class FeatureProdQuery extends ModelCriteria
             }
         }
 
-        return $this->addUsingAlias(FeatureProdTableMap::ID, $id, $comparison);
+        return $this->addUsingAlias(FeatureProductTableMap::ID, $id, $comparison);
     }
 
     /**
@@ -311,18 +311,18 @@ abstract class FeatureProdQuery extends ModelCriteria
      *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
      * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
-     * @return ChildFeatureProdQuery The current query, for fluid interface
+     * @return ChildFeatureProductQuery The current query, for fluid interface
      */
     public function filterByProductId($productId = null, $comparison = null)
     {
         if (is_array($productId)) {
             $useMinMax = false;
             if (isset($productId['min'])) {
-                $this->addUsingAlias(FeatureProdTableMap::PRODUCT_ID, $productId['min'], Criteria::GREATER_EQUAL);
+                $this->addUsingAlias(FeatureProductTableMap::PRODUCT_ID, $productId['min'], Criteria::GREATER_EQUAL);
                 $useMinMax = true;
             }
             if (isset($productId['max'])) {
-                $this->addUsingAlias(FeatureProdTableMap::PRODUCT_ID, $productId['max'], Criteria::LESS_EQUAL);
+                $this->addUsingAlias(FeatureProductTableMap::PRODUCT_ID, $productId['max'], Criteria::LESS_EQUAL);
                 $useMinMax = true;
             }
             if ($useMinMax) {
@@ -333,7 +333,7 @@ abstract class FeatureProdQuery extends ModelCriteria
             }
         }
 
-        return $this->addUsingAlias(FeatureProdTableMap::PRODUCT_ID, $productId, $comparison);
+        return $this->addUsingAlias(FeatureProductTableMap::PRODUCT_ID, $productId, $comparison);
     }
 
     /**
@@ -354,18 +354,18 @@ abstract class FeatureProdQuery extends ModelCriteria
      *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
      * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
-     * @return ChildFeatureProdQuery The current query, for fluid interface
+     * @return ChildFeatureProductQuery The current query, for fluid interface
      */
     public function filterByFeatureId($featureId = null, $comparison = null)
     {
         if (is_array($featureId)) {
             $useMinMax = false;
             if (isset($featureId['min'])) {
-                $this->addUsingAlias(FeatureProdTableMap::FEATURE_ID, $featureId['min'], Criteria::GREATER_EQUAL);
+                $this->addUsingAlias(FeatureProductTableMap::FEATURE_ID, $featureId['min'], Criteria::GREATER_EQUAL);
                 $useMinMax = true;
             }
             if (isset($featureId['max'])) {
-                $this->addUsingAlias(FeatureProdTableMap::FEATURE_ID, $featureId['max'], Criteria::LESS_EQUAL);
+                $this->addUsingAlias(FeatureProductTableMap::FEATURE_ID, $featureId['max'], Criteria::LESS_EQUAL);
                 $useMinMax = true;
             }
             if ($useMinMax) {
@@ -376,7 +376,7 @@ abstract class FeatureProdQuery extends ModelCriteria
             }
         }
 
-        return $this->addUsingAlias(FeatureProdTableMap::FEATURE_ID, $featureId, $comparison);
+        return $this->addUsingAlias(FeatureProductTableMap::FEATURE_ID, $featureId, $comparison);
     }
 
     /**
@@ -397,18 +397,18 @@ abstract class FeatureProdQuery extends ModelCriteria
      *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
      * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
-     * @return ChildFeatureProdQuery The current query, for fluid interface
+     * @return ChildFeatureProductQuery The current query, for fluid interface
      */
     public function filterByFeatureAvId($featureAvId = null, $comparison = null)
     {
         if (is_array($featureAvId)) {
             $useMinMax = false;
             if (isset($featureAvId['min'])) {
-                $this->addUsingAlias(FeatureProdTableMap::FEATURE_AV_ID, $featureAvId['min'], Criteria::GREATER_EQUAL);
+                $this->addUsingAlias(FeatureProductTableMap::FEATURE_AV_ID, $featureAvId['min'], Criteria::GREATER_EQUAL);
                 $useMinMax = true;
             }
             if (isset($featureAvId['max'])) {
-                $this->addUsingAlias(FeatureProdTableMap::FEATURE_AV_ID, $featureAvId['max'], Criteria::LESS_EQUAL);
+                $this->addUsingAlias(FeatureProductTableMap::FEATURE_AV_ID, $featureAvId['max'], Criteria::LESS_EQUAL);
                 $useMinMax = true;
             }
             if ($useMinMax) {
@@ -419,7 +419,7 @@ abstract class FeatureProdQuery extends ModelCriteria
             }
         }
 
-        return $this->addUsingAlias(FeatureProdTableMap::FEATURE_AV_ID, $featureAvId, $comparison);
+        return $this->addUsingAlias(FeatureProductTableMap::FEATURE_AV_ID, $featureAvId, $comparison);
     }
 
     /**
@@ -435,7 +435,7 @@ abstract class FeatureProdQuery extends ModelCriteria
      *              Accepts wildcards (* and % trigger a LIKE)
      * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
-     * @return ChildFeatureProdQuery The current query, for fluid interface
+     * @return ChildFeatureProductQuery The current query, for fluid interface
      */
     public function filterByByDefault($byDefault = null, $comparison = null)
     {
@@ -448,7 +448,7 @@ abstract class FeatureProdQuery extends ModelCriteria
             }
         }
 
-        return $this->addUsingAlias(FeatureProdTableMap::BY_DEFAULT, $byDefault, $comparison);
+        return $this->addUsingAlias(FeatureProductTableMap::BY_DEFAULT, $byDefault, $comparison);
     }
 
     /**
@@ -467,18 +467,18 @@ abstract class FeatureProdQuery extends ModelCriteria
      *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
      * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
-     * @return ChildFeatureProdQuery The current query, for fluid interface
+     * @return ChildFeatureProductQuery The current query, for fluid interface
      */
     public function filterByPosition($position = null, $comparison = null)
     {
         if (is_array($position)) {
             $useMinMax = false;
             if (isset($position['min'])) {
-                $this->addUsingAlias(FeatureProdTableMap::POSITION, $position['min'], Criteria::GREATER_EQUAL);
+                $this->addUsingAlias(FeatureProductTableMap::POSITION, $position['min'], Criteria::GREATER_EQUAL);
                 $useMinMax = true;
             }
             if (isset($position['max'])) {
-                $this->addUsingAlias(FeatureProdTableMap::POSITION, $position['max'], Criteria::LESS_EQUAL);
+                $this->addUsingAlias(FeatureProductTableMap::POSITION, $position['max'], Criteria::LESS_EQUAL);
                 $useMinMax = true;
             }
             if ($useMinMax) {
@@ -489,7 +489,7 @@ abstract class FeatureProdQuery extends ModelCriteria
             }
         }
 
-        return $this->addUsingAlias(FeatureProdTableMap::POSITION, $position, $comparison);
+        return $this->addUsingAlias(FeatureProductTableMap::POSITION, $position, $comparison);
     }
 
     /**
@@ -510,18 +510,18 @@ abstract class FeatureProdQuery extends ModelCriteria
      *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
      * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
-     * @return ChildFeatureProdQuery The current query, for fluid interface
+     * @return ChildFeatureProductQuery The current query, for fluid interface
      */
     public function filterByCreatedAt($createdAt = null, $comparison = null)
     {
         if (is_array($createdAt)) {
             $useMinMax = false;
             if (isset($createdAt['min'])) {
-                $this->addUsingAlias(FeatureProdTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL);
+                $this->addUsingAlias(FeatureProductTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL);
                 $useMinMax = true;
             }
             if (isset($createdAt['max'])) {
-                $this->addUsingAlias(FeatureProdTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL);
+                $this->addUsingAlias(FeatureProductTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL);
                 $useMinMax = true;
             }
             if ($useMinMax) {
@@ -532,7 +532,7 @@ abstract class FeatureProdQuery extends ModelCriteria
             }
         }
 
-        return $this->addUsingAlias(FeatureProdTableMap::CREATED_AT, $createdAt, $comparison);
+        return $this->addUsingAlias(FeatureProductTableMap::CREATED_AT, $createdAt, $comparison);
     }
 
     /**
@@ -553,18 +553,18 @@ abstract class FeatureProdQuery extends ModelCriteria
      *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
      * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
-     * @return ChildFeatureProdQuery The current query, for fluid interface
+     * @return ChildFeatureProductQuery The current query, for fluid interface
      */
     public function filterByUpdatedAt($updatedAt = null, $comparison = null)
     {
         if (is_array($updatedAt)) {
             $useMinMax = false;
             if (isset($updatedAt['min'])) {
-                $this->addUsingAlias(FeatureProdTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
+                $this->addUsingAlias(FeatureProductTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
                 $useMinMax = true;
             }
             if (isset($updatedAt['max'])) {
-                $this->addUsingAlias(FeatureProdTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
+                $this->addUsingAlias(FeatureProductTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
                 $useMinMax = true;
             }
             if ($useMinMax) {
@@ -575,7 +575,7 @@ abstract class FeatureProdQuery extends ModelCriteria
             }
         }
 
-        return $this->addUsingAlias(FeatureProdTableMap::UPDATED_AT, $updatedAt, $comparison);
+        return $this->addUsingAlias(FeatureProductTableMap::UPDATED_AT, $updatedAt, $comparison);
     }
 
     /**
@@ -584,20 +584,20 @@ abstract class FeatureProdQuery extends ModelCriteria
      * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
-     * @return ChildFeatureProdQuery The current query, for fluid interface
+     * @return ChildFeatureProductQuery The current query, for fluid interface
      */
     public function filterByProduct($product, $comparison = null)
     {
         if ($product instanceof \Thelia\Model\Product) {
             return $this
-                ->addUsingAlias(FeatureProdTableMap::PRODUCT_ID, $product->getId(), $comparison);
+                ->addUsingAlias(FeatureProductTableMap::PRODUCT_ID, $product->getId(), $comparison);
         } elseif ($product instanceof ObjectCollection) {
             if (null === $comparison) {
                 $comparison = Criteria::IN;
             }
 
             return $this
-                ->addUsingAlias(FeatureProdTableMap::PRODUCT_ID, $product->toKeyValue('PrimaryKey', 'Id'), $comparison);
+                ->addUsingAlias(FeatureProductTableMap::PRODUCT_ID, $product->toKeyValue('PrimaryKey', 'Id'), $comparison);
         } else {
             throw new PropelException('filterByProduct() only accepts arguments of type \Thelia\Model\Product or Collection');
         }
@@ -609,7 +609,7 @@ abstract class FeatureProdQuery extends ModelCriteria
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return ChildFeatureProdQuery The current query, for fluid interface
+     * @return ChildFeatureProductQuery The current query, for fluid interface
      */
     public function joinProduct($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -659,20 +659,20 @@ abstract class FeatureProdQuery extends ModelCriteria
      * @param \Thelia\Model\Feature|ObjectCollection $feature The related object(s) to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
-     * @return ChildFeatureProdQuery The current query, for fluid interface
+     * @return ChildFeatureProductQuery The current query, for fluid interface
      */
     public function filterByFeature($feature, $comparison = null)
     {
         if ($feature instanceof \Thelia\Model\Feature) {
             return $this
-                ->addUsingAlias(FeatureProdTableMap::FEATURE_ID, $feature->getId(), $comparison);
+                ->addUsingAlias(FeatureProductTableMap::FEATURE_ID, $feature->getId(), $comparison);
         } elseif ($feature instanceof ObjectCollection) {
             if (null === $comparison) {
                 $comparison = Criteria::IN;
             }
 
             return $this
-                ->addUsingAlias(FeatureProdTableMap::FEATURE_ID, $feature->toKeyValue('PrimaryKey', 'Id'), $comparison);
+                ->addUsingAlias(FeatureProductTableMap::FEATURE_ID, $feature->toKeyValue('PrimaryKey', 'Id'), $comparison);
         } else {
             throw new PropelException('filterByFeature() only accepts arguments of type \Thelia\Model\Feature or Collection');
         }
@@ -684,7 +684,7 @@ abstract class FeatureProdQuery extends ModelCriteria
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return ChildFeatureProdQuery The current query, for fluid interface
+     * @return ChildFeatureProductQuery The current query, for fluid interface
      */
     public function joinFeature($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -734,20 +734,20 @@ abstract class FeatureProdQuery extends ModelCriteria
      * @param \Thelia\Model\FeatureAv|ObjectCollection $featureAv The related object(s) to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
-     * @return ChildFeatureProdQuery The current query, for fluid interface
+     * @return ChildFeatureProductQuery The current query, for fluid interface
      */
     public function filterByFeatureAv($featureAv, $comparison = null)
     {
         if ($featureAv instanceof \Thelia\Model\FeatureAv) {
             return $this
-                ->addUsingAlias(FeatureProdTableMap::FEATURE_AV_ID, $featureAv->getId(), $comparison);
+                ->addUsingAlias(FeatureProductTableMap::FEATURE_AV_ID, $featureAv->getId(), $comparison);
         } elseif ($featureAv instanceof ObjectCollection) {
             if (null === $comparison) {
                 $comparison = Criteria::IN;
             }
 
             return $this
-                ->addUsingAlias(FeatureProdTableMap::FEATURE_AV_ID, $featureAv->toKeyValue('PrimaryKey', 'Id'), $comparison);
+                ->addUsingAlias(FeatureProductTableMap::FEATURE_AV_ID, $featureAv->toKeyValue('PrimaryKey', 'Id'), $comparison);
         } else {
             throw new PropelException('filterByFeatureAv() only accepts arguments of type \Thelia\Model\FeatureAv or Collection');
         }
@@ -759,7 +759,7 @@ abstract class FeatureProdQuery extends ModelCriteria
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return ChildFeatureProdQuery The current query, for fluid interface
+     * @return ChildFeatureProductQuery The current query, for fluid interface
      */
     public function joinFeatureAv($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
@@ -806,21 +806,21 @@ abstract class FeatureProdQuery extends ModelCriteria
     /**
      * Exclude object from result
      *
-     * @param   ChildFeatureProd $featureProd Object to remove from the list of results
+     * @param   ChildFeatureProduct $featureProduct Object to remove from the list of results
      *
-     * @return ChildFeatureProdQuery The current query, for fluid interface
+     * @return ChildFeatureProductQuery The current query, for fluid interface
      */
-    public function prune($featureProd = null)
+    public function prune($featureProduct = null)
     {
-        if ($featureProd) {
+        if ($featureProduct) {
-            $this->addUsingAlias(FeatureProdTableMap::ID, $featureProd->getId(), Criteria::NOT_EQUAL);
+            $this->addUsingAlias(FeatureProductTableMap::ID, $featureProduct->getId(), Criteria::NOT_EQUAL);
         }
 
         return $this;
     }
 
     /**
-     * Deletes all rows from the feature_prod table.
+     * Deletes all rows from the feature_product table.
      *
      * @param ConnectionInterface $con the connection to use
      * @return int The number of affected rows (if supported by underlying database driver).
@@ -828,7 +828,7 @@ abstract class FeatureProdQuery extends ModelCriteria
     public function doDeleteAll(ConnectionInterface $con = null)
     {
         if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(FeatureProdTableMap::DATABASE_NAME);
+            $con = Propel::getServiceContainer()->getWriteConnection(FeatureProductTableMap::DATABASE_NAME);
         }
         $affectedRows = 0; // initialize var to track total num of affected rows
         try {
@@ -839,8 +839,8 @@ abstract class FeatureProdQuery extends ModelCriteria
             // Because this db requires some delete cascade/set null emulation, we have to
             // clear the cached instance *after* the emulation has happened (since
             // instances get re-added by the select statement contained therein).
-            FeatureProdTableMap::clearInstancePool();
+            FeatureProductTableMap::clearInstancePool();
-            FeatureProdTableMap::clearRelatedInstancePool();
+            FeatureProductTableMap::clearRelatedInstancePool();
 
             $con->commit();
         } catch (PropelException $e) {
@@ -852,9 +852,9 @@ abstract class FeatureProdQuery extends ModelCriteria
     }
 
     /**
-     * Performs a DELETE on the database, given a ChildFeatureProd or Criteria object OR a primary key value.
+     * Performs a DELETE on the database, given a ChildFeatureProduct or Criteria object OR a primary key value.
      *
-     * @param mixed               $values Criteria or ChildFeatureProd object or primary key or array of primary keys
+     * @param mixed               $values Criteria or ChildFeatureProduct object or primary key or array of primary keys
      *              which is used to create the DELETE statement
      * @param ConnectionInterface $con the connection to use
      * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
@@ -865,13 +865,13 @@ abstract class FeatureProdQuery extends ModelCriteria
      public function delete(ConnectionInterface $con = null)
      {
         if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(FeatureProdTableMap::DATABASE_NAME);
+            $con = Propel::getServiceContainer()->getWriteConnection(FeatureProductTableMap::DATABASE_NAME);
         }
 
         $criteria = $this;
 
         // Set the correct dbName
-        $criteria->setDbName(FeatureProdTableMap::DATABASE_NAME);
+        $criteria->setDbName(FeatureProductTableMap::DATABASE_NAME);
 
         $affectedRows = 0; // initialize var to track total num of affected rows
 
@@ -881,10 +881,10 @@ abstract class FeatureProdQuery extends ModelCriteria
             $con->beginTransaction();
 
 
-        FeatureProdTableMap::removeInstanceFromPool($criteria);
+        FeatureProductTableMap::removeInstanceFromPool($criteria);
 
             $affectedRows += ModelCriteria::delete($con);
-            FeatureProdTableMap::clearRelatedInstancePool();
+            FeatureProductTableMap::clearRelatedInstancePool();
             $con->commit();
 
             return $affectedRows;
@@ -901,11 +901,11 @@ abstract class FeatureProdQuery extends ModelCriteria
      *
      * @param      int $nbDays Maximum age of the latest update in days
      *
-     * @return     ChildFeatureProdQuery The current query, for fluid interface
+     * @return     ChildFeatureProductQuery The current query, for fluid interface
      */
     public function recentlyUpdated($nbDays = 7)
     {
-        return $this->addUsingAlias(FeatureProdTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+        return $this->addUsingAlias(FeatureProductTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
     }
 
     /**
@@ -913,51 +913,51 @@ abstract class FeatureProdQuery extends ModelCriteria
      *
      * @param      int $nbDays Maximum age of in days
      *
-     * @return     ChildFeatureProdQuery The current query, for fluid interface
+     * @return     ChildFeatureProductQuery The current query, for fluid interface
      */
     public function recentlyCreated($nbDays = 7)
     {
-        return $this->addUsingAlias(FeatureProdTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+        return $this->addUsingAlias(FeatureProductTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
     }
 
     /**
      * Order by update date desc
      *
-     * @return     ChildFeatureProdQuery The current query, for fluid interface
+     * @return     ChildFeatureProductQuery The current query, for fluid interface
      */
     public function lastUpdatedFirst()
     {
-        return $this->addDescendingOrderByColumn(FeatureProdTableMap::UPDATED_AT);
+        return $this->addDescendingOrderByColumn(FeatureProductTableMap::UPDATED_AT);
     }
 
     /**
      * Order by update date asc
      *
-     * @return     ChildFeatureProdQuery The current query, for fluid interface
+     * @return     ChildFeatureProductQuery The current query, for fluid interface
      */
     public function firstUpdatedFirst()
     {
-        return $this->addAscendingOrderByColumn(FeatureProdTableMap::UPDATED_AT);
+        return $this->addAscendingOrderByColumn(FeatureProductTableMap::UPDATED_AT);
     }
 
     /**
      * Order by create date desc
      *
-     * @return     ChildFeatureProdQuery The current query, for fluid interface
+     * @return     ChildFeatureProductQuery The current query, for fluid interface
      */
     public function lastCreatedFirst()
     {
-        return $this->addDescendingOrderByColumn(FeatureProdTableMap::CREATED_AT);
+        return $this->addDescendingOrderByColumn(FeatureProductTableMap::CREATED_AT);
     }
 
     /**
      * Order by create date asc
      *
-     * @return     ChildFeatureProdQuery The current query, for fluid interface
+     * @return     ChildFeatureProductQuery The current query, for fluid interface
      */
     public function firstCreatedFirst()
     {
-        return $this->addAscendingOrderByColumn(FeatureProdTableMap::CREATED_AT);
+        return $this->addAscendingOrderByColumn(FeatureProductTableMap::CREATED_AT);
     }
 
-} // FeatureProdQuery
+} // FeatureProductQuery

core/lib/Thelia/Model/Base/FeatureQuery.php

@@ -42,9 +42,9 @@ use Thelia\Model\Map\FeatureTableMap;
  * @method     ChildFeatureQuery rightJoinFeatureAv($relationAlias = null) Adds a RIGHT JOIN clause to the query using the FeatureAv relation
  * @method     ChildFeatureQuery innerJoinFeatureAv($relationAlias = null) Adds a INNER JOIN clause to the query using the FeatureAv relation
  *
- * @method     ChildFeatureQuery leftJoinFeatureProd($relationAlias = null) Adds a LEFT JOIN clause to the query using the FeatureProd relation
+ * @method     ChildFeatureQuery leftJoinFeatureProduct($relationAlias = null) Adds a LEFT JOIN clause to the query using the FeatureProduct relation
- * @method     ChildFeatureQuery rightJoinFeatureProd($relationAlias = null) Adds a RIGHT JOIN clause to the query using the FeatureProd relation
+ * @method     ChildFeatureQuery rightJoinFeatureProduct($relationAlias = null) Adds a RIGHT JOIN clause to the query using the FeatureProduct relation
- * @method     ChildFeatureQuery innerJoinFeatureProd($relationAlias = null) Adds a INNER JOIN clause to the query using the FeatureProd relation
+ * @method     ChildFeatureQuery innerJoinFeatureProduct($relationAlias = null) Adds a INNER JOIN clause to the query using the FeatureProduct relation
  *
  * @method     ChildFeatureQuery leftJoinFeatureCategory($relationAlias = null) Adds a LEFT JOIN clause to the query using the FeatureCategory relation
  * @method     ChildFeatureQuery rightJoinFeatureCategory($relationAlias = null) Adds a RIGHT JOIN clause to the query using the FeatureCategory relation
@@ -528,40 +528,40 @@ abstract class FeatureQuery extends ModelCriteria
     }
 
     /**
-     * Filter the query by a related \Thelia\Model\FeatureProd object
+     * Filter the query by a related \Thelia\Model\FeatureProduct object
      *
-     * @param \Thelia\Model\FeatureProd|ObjectCollection $featureProd  the related object to use as filter
+     * @param \Thelia\Model\FeatureProduct|ObjectCollection $featureProduct  the related object to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildFeatureQuery The current query, for fluid interface
      */
-    public function filterByFeatureProd($featureProd, $comparison = null)
+    public function filterByFeatureProduct($featureProduct, $comparison = null)
     {
-        if ($featureProd instanceof \Thelia\Model\FeatureProd) {
+        if ($featureProduct instanceof \Thelia\Model\FeatureProduct) {
             return $this
-                ->addUsingAlias(FeatureTableMap::ID, $featureProd->getFeatureId(), $comparison);
+                ->addUsingAlias(FeatureTableMap::ID, $featureProduct->getFeatureId(), $comparison);
-        } elseif ($featureProd instanceof ObjectCollection) {
+        } elseif ($featureProduct instanceof ObjectCollection) {
             return $this
-                ->useFeatureProdQuery()
+                ->useFeatureProductQuery()
-                ->filterByPrimaryKeys($featureProd->getPrimaryKeys())
+                ->filterByPrimaryKeys($featureProduct->getPrimaryKeys())
                 ->endUse();
         } else {
-            throw new PropelException('filterByFeatureProd() only accepts arguments of type \Thelia\Model\FeatureProd or Collection');
+            throw new PropelException('filterByFeatureProduct() only accepts arguments of type \Thelia\Model\FeatureProduct or Collection');
         }
     }
 
     /**
-     * Adds a JOIN clause to the query using the FeatureProd relation
+     * Adds a JOIN clause to the query using the FeatureProduct relation
      *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildFeatureQuery The current query, for fluid interface
      */
-    public function joinFeatureProd($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function joinFeatureProduct($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
         $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('FeatureProd');
+        $relationMap = $tableMap->getRelation('FeatureProduct');
 
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -576,14 +576,14 @@ abstract class FeatureQuery extends ModelCriteria
             $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
             $this->addJoinObject($join, $relationAlias);
         } else {
-            $this->addJoinObject($join, 'FeatureProd');
+            $this->addJoinObject($join, 'FeatureProduct');
         }
 
         return $this;
     }
 
     /**
-     * Use the FeatureProd relation FeatureProd object
+     * Use the FeatureProduct relation FeatureProduct object
      *
      * @see useQuery()
      *
@@ -591,13 +591,13 @@ abstract class FeatureQuery extends ModelCriteria
      *                                   to be used as main alias in the secondary query
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return   \Thelia\Model\FeatureProdQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\FeatureProductQuery A secondary query class using the current class as primary query
      */
-    public function useFeatureProdQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function useFeatureProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
         return $this
-            ->joinFeatureProd($relationAlias, $joinType)
+            ->joinFeatureProduct($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'FeatureProd', '\Thelia\Model\FeatureProdQuery');
+            ->useQuery($relationAlias ? $relationAlias : 'FeatureProduct', '\Thelia\Model\FeatureProductQuery');
     }
 
     /**

core/lib/Thelia/Model/Base/ProductPriceQuery.php

@@ -0,0 +1,849 @@
+<?php
+
+namespace Thelia\Model\Base;
+
+use \Exception;
+use \PDO;
+use Propel\Runtime\Propel;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
+use Propel\Runtime\ActiveQuery\ModelJoin;
+use Propel\Runtime\Collection\Collection;
+use Propel\Runtime\Collection\ObjectCollection;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Exception\PropelException;
+use Thelia\Model\ProductPrice as ChildProductPrice;
+use Thelia\Model\ProductPriceQuery as ChildProductPriceQuery;
+use Thelia\Model\Map\ProductPriceTableMap;
+
+/**
+ * Base class that represents a query for the 'product_price' table.
+ *
+ *
+ *
+ * @method     ChildProductPriceQuery orderById($order = Criteria::ASC) Order by the id column
+ * @method     ChildProductPriceQuery orderByStockId($order = Criteria::ASC) Order by the stock_id column
+ * @method     ChildProductPriceQuery orderByCurrencyId($order = Criteria::ASC) Order by the currency_id column
+ * @method     ChildProductPriceQuery orderByPrice($order = Criteria::ASC) Order by the price column
+ * @method     ChildProductPriceQuery orderByPromoPrice($order = Criteria::ASC) Order by the promo_price column
+ * @method     ChildProductPriceQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
+ * @method     ChildProductPriceQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
+ *
+ * @method     ChildProductPriceQuery groupById() Group by the id column
+ * @method     ChildProductPriceQuery groupByStockId() Group by the stock_id column
+ * @method     ChildProductPriceQuery groupByCurrencyId() Group by the currency_id column
+ * @method     ChildProductPriceQuery groupByPrice() Group by the price column
+ * @method     ChildProductPriceQuery groupByPromoPrice() Group by the promo_price column
+ * @method     ChildProductPriceQuery groupByCreatedAt() Group by the created_at column
+ * @method     ChildProductPriceQuery groupByUpdatedAt() Group by the updated_at column
+ *
+ * @method     ChildProductPriceQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
+ * @method     ChildProductPriceQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
+ * @method     ChildProductPriceQuery innerJoin($relation) Adds a INNER JOIN clause to the query
+ *
+ * @method     ChildProductPriceQuery leftJoinStock($relationAlias = null) Adds a LEFT JOIN clause to the query using the Stock relation
+ * @method     ChildProductPriceQuery rightJoinStock($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Stock relation
+ * @method     ChildProductPriceQuery innerJoinStock($relationAlias = null) Adds a INNER JOIN clause to the query using the Stock relation
+ *
+ * @method     ChildProductPriceQuery leftJoinCurrency($relationAlias = null) Adds a LEFT JOIN clause to the query using the Currency relation
+ * @method     ChildProductPriceQuery rightJoinCurrency($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Currency relation
+ * @method     ChildProductPriceQuery innerJoinCurrency($relationAlias = null) Adds a INNER JOIN clause to the query using the Currency relation
+ *
+ * @method     ChildProductPrice findOne(ConnectionInterface $con = null) Return the first ChildProductPrice matching the query
+ * @method     ChildProductPrice findOneOrCreate(ConnectionInterface $con = null) Return the first ChildProductPrice matching the query, or a new ChildProductPrice object populated from the query conditions when no match is found
+ *
+ * @method     ChildProductPrice findOneById(int $id) Return the first ChildProductPrice filtered by the id column
+ * @method     ChildProductPrice findOneByStockId(int $stock_id) Return the first ChildProductPrice filtered by the stock_id column
+ * @method     ChildProductPrice findOneByCurrencyId(int $currency_id) Return the first ChildProductPrice filtered by the currency_id column
+ * @method     ChildProductPrice findOneByPrice(double $price) Return the first ChildProductPrice filtered by the price column
+ * @method     ChildProductPrice findOneByPromoPrice(double $promo_price) Return the first ChildProductPrice filtered by the promo_price column
+ * @method     ChildProductPrice findOneByCreatedAt(string $created_at) Return the first ChildProductPrice filtered by the created_at column
+ * @method     ChildProductPrice findOneByUpdatedAt(string $updated_at) Return the first ChildProductPrice filtered by the updated_at column
+ *
+ * @method     array findById(int $id) Return ChildProductPrice objects filtered by the id column
+ * @method     array findByStockId(int $stock_id) Return ChildProductPrice objects filtered by the stock_id column
+ * @method     array findByCurrencyId(int $currency_id) Return ChildProductPrice objects filtered by the currency_id column
+ * @method     array findByPrice(double $price) Return ChildProductPrice objects filtered by the price column
+ * @method     array findByPromoPrice(double $promo_price) Return ChildProductPrice objects filtered by the promo_price column
+ * @method     array findByCreatedAt(string $created_at) Return ChildProductPrice objects filtered by the created_at column
+ * @method     array findByUpdatedAt(string $updated_at) Return ChildProductPrice objects filtered by the updated_at column
+ *
+ */
+abstract class ProductPriceQuery extends ModelCriteria
+{
+
+    /**
+     * Initializes internal state of \Thelia\Model\Base\ProductPriceQuery object.
+     *
+     * @param     string $dbName The database name
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
+     */
+    public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\ProductPrice', $modelAlias = null)
+    {
+        parent::__construct($dbName, $modelName, $modelAlias);
+    }
+
+    /**
+     * Returns a new ChildProductPriceQuery object.
+     *
+     * @param     string $modelAlias The alias of a model in the query
+     * @param     Criteria $criteria Optional Criteria to build the query from
+     *
+     * @return ChildProductPriceQuery
+     */
+    public static function create($modelAlias = null, $criteria = null)
+    {
+        if ($criteria instanceof \Thelia\Model\ProductPriceQuery) {
+            return $criteria;
+        }
+        $query = new \Thelia\Model\ProductPriceQuery();
+        if (null !== $modelAlias) {
+            $query->setModelAlias($modelAlias);
+        }
+        if ($criteria instanceof Criteria) {
+            $query->mergeWith($criteria);
+        }
+
+        return $query;
+    }
+
+    /**
+     * Find object by primary key.
+     * Propel uses the instance pool to skip the database if the object exists.
+     * Go fast if the query is untouched.
+     *
+     * <code>
+     * $obj  = $c->findPk(12, $con);
+     * </code>
+     *
+     * @param mixed $key Primary key to use for the query
+     * @param ConnectionInterface $con an optional connection object
+     *
+     * @return ChildProductPrice|array|mixed the result, formatted by the current formatter
+     */
+    public function findPk($key, $con = null)
+    {
+        if ($key === null) {
+            return null;
+        }
+        if ((null !== ($obj = ProductPriceTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
+            // the object is already in the instance pool
+            return $obj;
+        }
+        if ($con === null) {
+            $con = Propel::getServiceContainer()->getReadConnection(ProductPriceTableMap::DATABASE_NAME);
+        }
+        $this->basePreSelect($con);
+        if ($this->formatter || $this->modelAlias || $this->with || $this->select
+         || $this->selectColumns || $this->asColumns || $this->selectModifiers
+         || $this->map || $this->having || $this->joins) {
+            return $this->findPkComplex($key, $con);
+        } else {
+            return $this->findPkSimple($key, $con);
+        }
+    }
+
+    /**
+     * Find object by primary key using raw SQL to go fast.
+     * Bypass doSelect() and the object formatter by using generated code.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     ConnectionInterface $con A connection object
+     *
+     * @return   ChildProductPrice A model object, or null if the key is not found
+     */
+    protected function findPkSimple($key, $con)
+    {
+        $sql = 'SELECT ID, STOCK_ID, CURRENCY_ID, PRICE, PROMO_PRICE, CREATED_AT, UPDATED_AT FROM product_price WHERE ID = :p0';
+        try {
+            $stmt = $con->prepare($sql);
+            $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
+        }
+        $obj = null;
+        if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
+            $obj = new ChildProductPrice();
+            $obj->hydrate($row);
+            ProductPriceTableMap::addInstanceToPool($obj, (string) $key);
+        }
+        $stmt->closeCursor();
+
+        return $obj;
+    }
+
+    /**
+     * Find object by primary key.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     ConnectionInterface $con A connection object
+     *
+     * @return ChildProductPrice|array|mixed the result, formatted by the current formatter
+     */
+    protected function findPkComplex($key, $con)
+    {
+        // As the query uses a PK condition, no limit(1) is necessary.
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $dataFetcher = $criteria
+            ->filterByPrimaryKey($key)
+            ->doSelect($con);
+
+        return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher);
+    }
+
+    /**
+     * Find objects by primary key
+     * <code>
+     * $objs = $c->findPks(array(12, 56, 832), $con);
+     * </code>
+     * @param     array $keys Primary keys to use for the query
+     * @param     ConnectionInterface $con an optional connection object
+     *
+     * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
+     */
+    public function findPks($keys, $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getReadConnection($this->getDbName());
+        }
+        $this->basePreSelect($con);
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $dataFetcher = $criteria
+            ->filterByPrimaryKeys($keys)
+            ->doSelect($con);
+
+        return $criteria->getFormatter()->init($criteria)->format($dataFetcher);
+    }
+
+    /**
+     * Filter the query by primary key
+     *
+     * @param     mixed $key Primary key to use for the query
+     *
+     * @return ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function filterByPrimaryKey($key)
+    {
+
+        return $this->addUsingAlias(ProductPriceTableMap::ID, $key, Criteria::EQUAL);
+    }
+
+    /**
+     * Filter the query by a list of primary keys
+     *
+     * @param     array $keys The list of primary key to use for the query
+     *
+     * @return ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function filterByPrimaryKeys($keys)
+    {
+
+        return $this->addUsingAlias(ProductPriceTableMap::ID, $keys, Criteria::IN);
+    }
+
+    /**
+     * Filter the query on the id column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterById(1234); // WHERE id = 1234
+     * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
+     * $query->filterById(array('min' => 12)); // WHERE id > 12
+     * </code>
+     *
+     * @param     mixed $id The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function filterById($id = null, $comparison = null)
+    {
+        if (is_array($id)) {
+            $useMinMax = false;
+            if (isset($id['min'])) {
+                $this->addUsingAlias(ProductPriceTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($id['max'])) {
+                $this->addUsingAlias(ProductPriceTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(ProductPriceTableMap::ID, $id, $comparison);
+    }
+
+    /**
+     * Filter the query on the stock_id column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByStockId(1234); // WHERE stock_id = 1234
+     * $query->filterByStockId(array(12, 34)); // WHERE stock_id IN (12, 34)
+     * $query->filterByStockId(array('min' => 12)); // WHERE stock_id > 12
+     * </code>
+     *
+     * @see       filterByStock()
+     *
+     * @param     mixed $stockId The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function filterByStockId($stockId = null, $comparison = null)
+    {
+        if (is_array($stockId)) {
+            $useMinMax = false;
+            if (isset($stockId['min'])) {
+                $this->addUsingAlias(ProductPriceTableMap::STOCK_ID, $stockId['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($stockId['max'])) {
+                $this->addUsingAlias(ProductPriceTableMap::STOCK_ID, $stockId['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(ProductPriceTableMap::STOCK_ID, $stockId, $comparison);
+    }
+
+    /**
+     * Filter the query on the currency_id column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByCurrencyId(1234); // WHERE currency_id = 1234
+     * $query->filterByCurrencyId(array(12, 34)); // WHERE currency_id IN (12, 34)
+     * $query->filterByCurrencyId(array('min' => 12)); // WHERE currency_id > 12
+     * </code>
+     *
+     * @see       filterByCurrency()
+     *
+     * @param     mixed $currencyId The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function filterByCurrencyId($currencyId = null, $comparison = null)
+    {
+        if (is_array($currencyId)) {
+            $useMinMax = false;
+            if (isset($currencyId['min'])) {
+                $this->addUsingAlias(ProductPriceTableMap::CURRENCY_ID, $currencyId['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($currencyId['max'])) {
+                $this->addUsingAlias(ProductPriceTableMap::CURRENCY_ID, $currencyId['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(ProductPriceTableMap::CURRENCY_ID, $currencyId, $comparison);
+    }
+
+    /**
+     * Filter the query on the price column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByPrice(1234); // WHERE price = 1234
+     * $query->filterByPrice(array(12, 34)); // WHERE price IN (12, 34)
+     * $query->filterByPrice(array('min' => 12)); // WHERE price > 12
+     * </code>
+     *
+     * @param     mixed $price The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function filterByPrice($price = null, $comparison = null)
+    {
+        if (is_array($price)) {
+            $useMinMax = false;
+            if (isset($price['min'])) {
+                $this->addUsingAlias(ProductPriceTableMap::PRICE, $price['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($price['max'])) {
+                $this->addUsingAlias(ProductPriceTableMap::PRICE, $price['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(ProductPriceTableMap::PRICE, $price, $comparison);
+    }
+
+    /**
+     * Filter the query on the promo_price column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByPromoPrice(1234); // WHERE promo_price = 1234
+     * $query->filterByPromoPrice(array(12, 34)); // WHERE promo_price IN (12, 34)
+     * $query->filterByPromoPrice(array('min' => 12)); // WHERE promo_price > 12
+     * </code>
+     *
+     * @param     mixed $promoPrice The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function filterByPromoPrice($promoPrice = null, $comparison = null)
+    {
+        if (is_array($promoPrice)) {
+            $useMinMax = false;
+            if (isset($promoPrice['min'])) {
+                $this->addUsingAlias(ProductPriceTableMap::PROMO_PRICE, $promoPrice['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($promoPrice['max'])) {
+                $this->addUsingAlias(ProductPriceTableMap::PROMO_PRICE, $promoPrice['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(ProductPriceTableMap::PROMO_PRICE, $promoPrice, $comparison);
+    }
+
+    /**
+     * Filter the query on the created_at column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14'
+     * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14'
+     * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
+     * </code>
+     *
+     * @param     mixed $createdAt The value to use as filter.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Empty strings are treated as NULL.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function filterByCreatedAt($createdAt = null, $comparison = null)
+    {
+        if (is_array($createdAt)) {
+            $useMinMax = false;
+            if (isset($createdAt['min'])) {
+                $this->addUsingAlias(ProductPriceTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($createdAt['max'])) {
+                $this->addUsingAlias(ProductPriceTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(ProductPriceTableMap::CREATED_AT, $createdAt, $comparison);
+    }
+
+    /**
+     * Filter the query on the updated_at column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14'
+     * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14'
+     * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
+     * </code>
+     *
+     * @param     mixed $updatedAt The value to use as filter.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Empty strings are treated as NULL.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function filterByUpdatedAt($updatedAt = null, $comparison = null)
+    {
+        if (is_array($updatedAt)) {
+            $useMinMax = false;
+            if (isset($updatedAt['min'])) {
+                $this->addUsingAlias(ProductPriceTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($updatedAt['max'])) {
+                $this->addUsingAlias(ProductPriceTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(ProductPriceTableMap::UPDATED_AT, $updatedAt, $comparison);
+    }
+
+    /**
+     * Filter the query by a related \Thelia\Model\Stock object
+     *
+     * @param \Thelia\Model\Stock|ObjectCollection $stock The related object(s) to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function filterByStock($stock, $comparison = null)
+    {
+        if ($stock instanceof \Thelia\Model\Stock) {
+            return $this
+                ->addUsingAlias(ProductPriceTableMap::STOCK_ID, $stock->getId(), $comparison);
+        } elseif ($stock instanceof ObjectCollection) {
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+
+            return $this
+                ->addUsingAlias(ProductPriceTableMap::STOCK_ID, $stock->toKeyValue('PrimaryKey', 'Id'), $comparison);
+        } else {
+            throw new PropelException('filterByStock() only accepts arguments of type \Thelia\Model\Stock or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the Stock relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function joinStock($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('Stock');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'Stock');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the Stock relation Stock object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return   \Thelia\Model\StockQuery A secondary query class using the current class as primary query
+     */
+    public function useStockQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        return $this
+            ->joinStock($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'Stock', '\Thelia\Model\StockQuery');
+    }
+
+    /**
+     * Filter the query by a related \Thelia\Model\Currency object
+     *
+     * @param \Thelia\Model\Currency|ObjectCollection $currency The related object(s) to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function filterByCurrency($currency, $comparison = null)
+    {
+        if ($currency instanceof \Thelia\Model\Currency) {
+            return $this
+                ->addUsingAlias(ProductPriceTableMap::CURRENCY_ID, $currency->getId(), $comparison);
+        } elseif ($currency instanceof ObjectCollection) {
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+
+            return $this
+                ->addUsingAlias(ProductPriceTableMap::CURRENCY_ID, $currency->toKeyValue('PrimaryKey', 'Id'), $comparison);
+        } else {
+            throw new PropelException('filterByCurrency() only accepts arguments of type \Thelia\Model\Currency or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the Currency relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function joinCurrency($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('Currency');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'Currency');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the Currency relation Currency object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return   \Thelia\Model\CurrencyQuery A secondary query class using the current class as primary query
+     */
+    public function useCurrencyQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        return $this
+            ->joinCurrency($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'Currency', '\Thelia\Model\CurrencyQuery');
+    }
+
+    /**
+     * Exclude object from result
+     *
+     * @param   ChildProductPrice $productPrice Object to remove from the list of results
+     *
+     * @return ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function prune($productPrice = null)
+    {
+        if ($productPrice) {
+            $this->addUsingAlias(ProductPriceTableMap::ID, $productPrice->getId(), Criteria::NOT_EQUAL);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Deletes all rows from the product_price table.
+     *
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).
+     */
+    public function doDeleteAll(ConnectionInterface $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(ProductPriceTableMap::DATABASE_NAME);
+        }
+        $affectedRows = 0; // initialize var to track total num of affected rows
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table or we could emulating ON DELETE CASCADE, etc.
+            $con->beginTransaction();
+            $affectedRows += parent::doDeleteAll($con);
+            // Because this db requires some delete cascade/set null emulation, we have to
+            // clear the cached instance *after* the emulation has happened (since
+            // instances get re-added by the select statement contained therein).
+            ProductPriceTableMap::clearInstancePool();
+            ProductPriceTableMap::clearRelatedInstancePool();
+
+            $con->commit();
+        } catch (PropelException $e) {
+            $con->rollBack();
+            throw $e;
+        }
+
+        return $affectedRows;
+    }
+
+    /**
+     * Performs a DELETE on the database, given a ChildProductPrice or Criteria object OR a primary key value.
+     *
+     * @param mixed               $values Criteria or ChildProductPrice object or primary key or array of primary keys
+     *              which is used to create the DELETE statement
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     *                if supported by native driver or if emulated using Propel.
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+     public function delete(ConnectionInterface $con = null)
+     {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(ProductPriceTableMap::DATABASE_NAME);
+        }
+
+        $criteria = $this;
+
+        // Set the correct dbName
+        $criteria->setDbName(ProductPriceTableMap::DATABASE_NAME);
+
+        $affectedRows = 0; // initialize var to track total num of affected rows
+
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table or we could emulating ON DELETE CASCADE, etc.
+            $con->beginTransaction();
+
+
+        ProductPriceTableMap::removeInstanceFromPool($criteria);
+
+            $affectedRows += ModelCriteria::delete($con);
+            ProductPriceTableMap::clearRelatedInstancePool();
+            $con->commit();
+
+            return $affectedRows;
+        } catch (PropelException $e) {
+            $con->rollBack();
+            throw $e;
+        }
+    }
+
+    // timestampable behavior
+
+    /**
+     * Filter by the latest updated
+     *
+     * @param      int $nbDays Maximum age of the latest update in days
+     *
+     * @return     ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function recentlyUpdated($nbDays = 7)
+    {
+        return $this->addUsingAlias(ProductPriceTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+    }
+
+    /**
+     * Filter by the latest created
+     *
+     * @param      int $nbDays Maximum age of in days
+     *
+     * @return     ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function recentlyCreated($nbDays = 7)
+    {
+        return $this->addUsingAlias(ProductPriceTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+    }
+
+    /**
+     * Order by update date desc
+     *
+     * @return     ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function lastUpdatedFirst()
+    {
+        return $this->addDescendingOrderByColumn(ProductPriceTableMap::UPDATED_AT);
+    }
+
+    /**
+     * Order by update date asc
+     *
+     * @return     ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function firstUpdatedFirst()
+    {
+        return $this->addAscendingOrderByColumn(ProductPriceTableMap::UPDATED_AT);
+    }
+
+    /**
+     * Order by create date desc
+     *
+     * @return     ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function lastCreatedFirst()
+    {
+        return $this->addDescendingOrderByColumn(ProductPriceTableMap::CREATED_AT);
+    }
+
+    /**
+     * Order by create date asc
+     *
+     * @return     ChildProductPriceQuery The current query, for fluid interface
+     */
+    public function firstCreatedFirst()
+    {
+        return $this->addAscendingOrderByColumn(ProductPriceTableMap::CREATED_AT);
+    }
+
+} // ProductPriceQuery

core/lib/Thelia/Model/Base/ProductQuery.php

@@ -25,14 +25,7 @@ use Thelia\Model\Map\ProductTableMap;
  * @method     ChildProductQuery orderById($order = Criteria::ASC) Order by the id column
  * @method     ChildProductQuery orderByTaxRuleId($order = Criteria::ASC) Order by the tax_rule_id column
  * @method     ChildProductQuery orderByRef($order = Criteria::ASC) Order by the ref column
- * @method     ChildProductQuery orderByPrice($order = Criteria::ASC) Order by the price column
- * @method     ChildProductQuery orderByPrice2($order = Criteria::ASC) Order by the price2 column
- * @method     ChildProductQuery orderByEcotax($order = Criteria::ASC) Order by the ecotax column
- * @method     ChildProductQuery orderByNewness($order = Criteria::ASC) Order by the newness column
- * @method     ChildProductQuery orderByPromo($order = Criteria::ASC) Order by the promo column
- * @method     ChildProductQuery orderByQuantity($order = Criteria::ASC) Order by the quantity column
  * @method     ChildProductQuery orderByVisible($order = Criteria::ASC) Order by the visible column
- * @method     ChildProductQuery orderByWeight($order = Criteria::ASC) Order by the weight column
  * @method     ChildProductQuery orderByPosition($order = Criteria::ASC) Order by the position column
  * @method     ChildProductQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
  * @method     ChildProductQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
@@ -43,14 +36,7 @@ use Thelia\Model\Map\ProductTableMap;
  * @method     ChildProductQuery groupById() Group by the id column
  * @method     ChildProductQuery groupByTaxRuleId() Group by the tax_rule_id column
  * @method     ChildProductQuery groupByRef() Group by the ref column
- * @method     ChildProductQuery groupByPrice() Group by the price column
- * @method     ChildProductQuery groupByPrice2() Group by the price2 column
- * @method     ChildProductQuery groupByEcotax() Group by the ecotax column
- * @method     ChildProductQuery groupByNewness() Group by the newness column
- * @method     ChildProductQuery groupByPromo() Group by the promo column
- * @method     ChildProductQuery groupByQuantity() Group by the quantity column
  * @method     ChildProductQuery groupByVisible() Group by the visible column
- * @method     ChildProductQuery groupByWeight() Group by the weight column
  * @method     ChildProductQuery groupByPosition() Group by the position column
  * @method     ChildProductQuery groupByCreatedAt() Group by the created_at column
  * @method     ChildProductQuery groupByUpdatedAt() Group by the updated_at column
@@ -70,9 +56,9 @@ use Thelia\Model\Map\ProductTableMap;
  * @method     ChildProductQuery rightJoinProductCategory($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ProductCategory relation
  * @method     ChildProductQuery innerJoinProductCategory($relationAlias = null) Adds a INNER JOIN clause to the query using the ProductCategory relation
  *
- * @method     ChildProductQuery leftJoinFeatureProd($relationAlias = null) Adds a LEFT JOIN clause to the query using the FeatureProd relation
+ * @method     ChildProductQuery leftJoinFeatureProduct($relationAlias = null) Adds a LEFT JOIN clause to the query using the FeatureProduct relation
- * @method     ChildProductQuery rightJoinFeatureProd($relationAlias = null) Adds a RIGHT JOIN clause to the query using the FeatureProd relation
+ * @method     ChildProductQuery rightJoinFeatureProduct($relationAlias = null) Adds a RIGHT JOIN clause to the query using the FeatureProduct relation
- * @method     ChildProductQuery innerJoinFeatureProd($relationAlias = null) Adds a INNER JOIN clause to the query using the FeatureProd relation
+ * @method     ChildProductQuery innerJoinFeatureProduct($relationAlias = null) Adds a INNER JOIN clause to the query using the FeatureProduct relation
  *
  * @method     ChildProductQuery leftJoinStock($relationAlias = null) Adds a LEFT JOIN clause to the query using the Stock relation
  * @method     ChildProductQuery rightJoinStock($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Stock relation
@@ -120,14 +106,7 @@ use Thelia\Model\Map\ProductTableMap;
  * @method     ChildProduct findOneById(int $id) Return the first ChildProduct filtered by the id column
  * @method     ChildProduct findOneByTaxRuleId(int $tax_rule_id) Return the first ChildProduct filtered by the tax_rule_id column
  * @method     ChildProduct findOneByRef(string $ref) Return the first ChildProduct filtered by the ref column
- * @method     ChildProduct findOneByPrice(double $price) Return the first ChildProduct filtered by the price column
- * @method     ChildProduct findOneByPrice2(double $price2) Return the first ChildProduct filtered by the price2 column
- * @method     ChildProduct findOneByEcotax(double $ecotax) Return the first ChildProduct filtered by the ecotax column
- * @method     ChildProduct findOneByNewness(int $newness) Return the first ChildProduct filtered by the newness column
- * @method     ChildProduct findOneByPromo(int $promo) Return the first ChildProduct filtered by the promo column
- * @method     ChildProduct findOneByQuantity(int $quantity) Return the first ChildProduct filtered by the quantity column
  * @method     ChildProduct findOneByVisible(int $visible) Return the first ChildProduct filtered by the visible column
- * @method     ChildProduct findOneByWeight(double $weight) Return the first ChildProduct filtered by the weight column
  * @method     ChildProduct findOneByPosition(int $position) Return the first ChildProduct filtered by the position column
  * @method     ChildProduct findOneByCreatedAt(string $created_at) Return the first ChildProduct filtered by the created_at column
  * @method     ChildProduct findOneByUpdatedAt(string $updated_at) Return the first ChildProduct filtered by the updated_at column
@@ -138,14 +117,7 @@ use Thelia\Model\Map\ProductTableMap;
  * @method     array findById(int $id) Return ChildProduct objects filtered by the id column
  * @method     array findByTaxRuleId(int $tax_rule_id) Return ChildProduct objects filtered by the tax_rule_id column
  * @method     array findByRef(string $ref) Return ChildProduct objects filtered by the ref column
- * @method     array findByPrice(double $price) Return ChildProduct objects filtered by the price column
- * @method     array findByPrice2(double $price2) Return ChildProduct objects filtered by the price2 column
- * @method     array findByEcotax(double $ecotax) Return ChildProduct objects filtered by the ecotax column
- * @method     array findByNewness(int $newness) Return ChildProduct objects filtered by the newness column
- * @method     array findByPromo(int $promo) Return ChildProduct objects filtered by the promo column
- * @method     array findByQuantity(int $quantity) Return ChildProduct objects filtered by the quantity column
  * @method     array findByVisible(int $visible) Return ChildProduct objects filtered by the visible column
- * @method     array findByWeight(double $weight) Return ChildProduct objects filtered by the weight column
  * @method     array findByPosition(int $position) Return ChildProduct objects filtered by the position column
  * @method     array findByCreatedAt(string $created_at) Return ChildProduct objects filtered by the created_at column
  * @method     array findByUpdatedAt(string $updated_at) Return ChildProduct objects filtered by the updated_at column
@@ -247,7 +219,7 @@ abstract class ProductQuery extends ModelCriteria
      */
     protected function findPkSimple($key, $con)
     {
-        $sql = 'SELECT ID, TAX_RULE_ID, REF, PRICE, PRICE2, ECOTAX, NEWNESS, PROMO, QUANTITY, VISIBLE, WEIGHT, POSITION, CREATED_AT, UPDATED_AT, VERSION, VERSION_CREATED_AT, VERSION_CREATED_BY FROM product WHERE ID = :p0';
+        $sql = 'SELECT ID, TAX_RULE_ID, REF, VISIBLE, POSITION, CREATED_AT, UPDATED_AT, VERSION, VERSION_CREATED_AT, VERSION_CREATED_BY FROM product WHERE ID = :p0';
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -449,252 +421,6 @@ abstract class ProductQuery extends ModelCriteria
         return $this->addUsingAlias(ProductTableMap::REF, $ref, $comparison);
     }
 
-    /**
-     * Filter the query on the price column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByPrice(1234); // WHERE price = 1234
-     * $query->filterByPrice(array(12, 34)); // WHERE price IN (12, 34)
-     * $query->filterByPrice(array('min' => 12)); // WHERE price > 12
-     * </code>
-     *
-     * @param     mixed $price The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildProductQuery The current query, for fluid interface
-     */
-    public function filterByPrice($price = null, $comparison = null)
-    {
-        if (is_array($price)) {
-            $useMinMax = false;
-            if (isset($price['min'])) {
-                $this->addUsingAlias(ProductTableMap::PRICE, $price['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($price['max'])) {
-                $this->addUsingAlias(ProductTableMap::PRICE, $price['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(ProductTableMap::PRICE, $price, $comparison);
-    }
-
-    /**
-     * Filter the query on the price2 column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByPrice2(1234); // WHERE price2 = 1234
-     * $query->filterByPrice2(array(12, 34)); // WHERE price2 IN (12, 34)
-     * $query->filterByPrice2(array('min' => 12)); // WHERE price2 > 12
-     * </code>
-     *
-     * @param     mixed $price2 The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildProductQuery The current query, for fluid interface
-     */
-    public function filterByPrice2($price2 = null, $comparison = null)
-    {
-        if (is_array($price2)) {
-            $useMinMax = false;
-            if (isset($price2['min'])) {
-                $this->addUsingAlias(ProductTableMap::PRICE2, $price2['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($price2['max'])) {
-                $this->addUsingAlias(ProductTableMap::PRICE2, $price2['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(ProductTableMap::PRICE2, $price2, $comparison);
-    }
-
-    /**
-     * Filter the query on the ecotax column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByEcotax(1234); // WHERE ecotax = 1234
-     * $query->filterByEcotax(array(12, 34)); // WHERE ecotax IN (12, 34)
-     * $query->filterByEcotax(array('min' => 12)); // WHERE ecotax > 12
-     * </code>
-     *
-     * @param     mixed $ecotax The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildProductQuery The current query, for fluid interface
-     */
-    public function filterByEcotax($ecotax = null, $comparison = null)
-    {
-        if (is_array($ecotax)) {
-            $useMinMax = false;
-            if (isset($ecotax['min'])) {
-                $this->addUsingAlias(ProductTableMap::ECOTAX, $ecotax['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($ecotax['max'])) {
-                $this->addUsingAlias(ProductTableMap::ECOTAX, $ecotax['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(ProductTableMap::ECOTAX, $ecotax, $comparison);
-    }
-
-    /**
-     * Filter the query on the newness column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByNewness(1234); // WHERE newness = 1234
-     * $query->filterByNewness(array(12, 34)); // WHERE newness IN (12, 34)
-     * $query->filterByNewness(array('min' => 12)); // WHERE newness > 12
-     * </code>
-     *
-     * @param     mixed $newness The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildProductQuery The current query, for fluid interface
-     */
-    public function filterByNewness($newness = null, $comparison = null)
-    {
-        if (is_array($newness)) {
-            $useMinMax = false;
-            if (isset($newness['min'])) {
-                $this->addUsingAlias(ProductTableMap::NEWNESS, $newness['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($newness['max'])) {
-                $this->addUsingAlias(ProductTableMap::NEWNESS, $newness['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(ProductTableMap::NEWNESS, $newness, $comparison);
-    }
-
-    /**
-     * Filter the query on the promo column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByPromo(1234); // WHERE promo = 1234
-     * $query->filterByPromo(array(12, 34)); // WHERE promo IN (12, 34)
-     * $query->filterByPromo(array('min' => 12)); // WHERE promo > 12
-     * </code>
-     *
-     * @param     mixed $promo The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildProductQuery The current query, for fluid interface
-     */
-    public function filterByPromo($promo = null, $comparison = null)
-    {
-        if (is_array($promo)) {
-            $useMinMax = false;
-            if (isset($promo['min'])) {
-                $this->addUsingAlias(ProductTableMap::PROMO, $promo['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($promo['max'])) {
-                $this->addUsingAlias(ProductTableMap::PROMO, $promo['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(ProductTableMap::PROMO, $promo, $comparison);
-    }
-
-    /**
-     * Filter the query on the quantity column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByQuantity(1234); // WHERE quantity = 1234
-     * $query->filterByQuantity(array(12, 34)); // WHERE quantity IN (12, 34)
-     * $query->filterByQuantity(array('min' => 12)); // WHERE quantity > 12
-     * </code>
-     *
-     * @param     mixed $quantity The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildProductQuery The current query, for fluid interface
-     */
-    public function filterByQuantity($quantity = null, $comparison = null)
-    {
-        if (is_array($quantity)) {
-            $useMinMax = false;
-            if (isset($quantity['min'])) {
-                $this->addUsingAlias(ProductTableMap::QUANTITY, $quantity['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($quantity['max'])) {
-                $this->addUsingAlias(ProductTableMap::QUANTITY, $quantity['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(ProductTableMap::QUANTITY, $quantity, $comparison);
-    }
-
     /**
      * Filter the query on the visible column
      *
@@ -736,47 +462,6 @@ abstract class ProductQuery extends ModelCriteria
         return $this->addUsingAlias(ProductTableMap::VISIBLE, $visible, $comparison);
     }
 
-    /**
-     * Filter the query on the weight column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByWeight(1234); // WHERE weight = 1234
-     * $query->filterByWeight(array(12, 34)); // WHERE weight IN (12, 34)
-     * $query->filterByWeight(array('min' => 12)); // WHERE weight > 12
-     * </code>
-     *
-     * @param     mixed $weight The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildProductQuery The current query, for fluid interface
-     */
-    public function filterByWeight($weight = null, $comparison = null)
-    {
-        if (is_array($weight)) {
-            $useMinMax = false;
-            if (isset($weight['min'])) {
-                $this->addUsingAlias(ProductTableMap::WEIGHT, $weight['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($weight['max'])) {
-                $this->addUsingAlias(ProductTableMap::WEIGHT, $weight['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(ProductTableMap::WEIGHT, $weight, $comparison);
-    }
-
     /**
      * Filter the query on the position column
      *
@@ -1166,40 +851,40 @@ abstract class ProductQuery extends ModelCriteria
     }
 
     /**
-     * Filter the query by a related \Thelia\Model\FeatureProd object
+     * Filter the query by a related \Thelia\Model\FeatureProduct object
      *
-     * @param \Thelia\Model\FeatureProd|ObjectCollection $featureProd  the related object to use as filter
+     * @param \Thelia\Model\FeatureProduct|ObjectCollection $featureProduct  the related object to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildProductQuery The current query, for fluid interface
      */
-    public function filterByFeatureProd($featureProd, $comparison = null)
+    public function filterByFeatureProduct($featureProduct, $comparison = null)
     {
-        if ($featureProd instanceof \Thelia\Model\FeatureProd) {
+        if ($featureProduct instanceof \Thelia\Model\FeatureProduct) {
             return $this
-                ->addUsingAlias(ProductTableMap::ID, $featureProd->getProductId(), $comparison);
+                ->addUsingAlias(ProductTableMap::ID, $featureProduct->getProductId(), $comparison);
-        } elseif ($featureProd instanceof ObjectCollection) {
+        } elseif ($featureProduct instanceof ObjectCollection) {
             return $this
-                ->useFeatureProdQuery()
+                ->useFeatureProductQuery()
-                ->filterByPrimaryKeys($featureProd->getPrimaryKeys())
+                ->filterByPrimaryKeys($featureProduct->getPrimaryKeys())
                 ->endUse();
         } else {
-            throw new PropelException('filterByFeatureProd() only accepts arguments of type \Thelia\Model\FeatureProd or Collection');
+            throw new PropelException('filterByFeatureProduct() only accepts arguments of type \Thelia\Model\FeatureProduct or Collection');
         }
     }
 
     /**
-     * Adds a JOIN clause to the query using the FeatureProd relation
+     * Adds a JOIN clause to the query using the FeatureProduct relation
      *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildProductQuery The current query, for fluid interface
      */
-    public function joinFeatureProd($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function joinFeatureProduct($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
         $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('FeatureProd');
+        $relationMap = $tableMap->getRelation('FeatureProduct');
 
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -1214,14 +899,14 @@ abstract class ProductQuery extends ModelCriteria
             $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
             $this->addJoinObject($join, $relationAlias);
         } else {
-            $this->addJoinObject($join, 'FeatureProd');
+            $this->addJoinObject($join, 'FeatureProduct');
         }
 
         return $this;
     }
 
     /**
-     * Use the FeatureProd relation FeatureProd object
+     * Use the FeatureProduct relation FeatureProduct object
      *
      * @see useQuery()
      *
@@ -1229,13 +914,13 @@ abstract class ProductQuery extends ModelCriteria
      *                                   to be used as main alias in the secondary query
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return   \Thelia\Model\FeatureProdQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\FeatureProductQuery A secondary query class using the current class as primary query
      */
-    public function useFeatureProdQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function useFeatureProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
         return $this
-            ->joinFeatureProd($relationAlias, $joinType)
+            ->joinFeatureProduct($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'FeatureProd', '\Thelia\Model\FeatureProdQuery');
+            ->useQuery($relationAlias ? $relationAlias : 'FeatureProduct', '\Thelia\Model\FeatureProductQuery');
     }
 
     /**

core/lib/Thelia/Model/Base/ProductVersion.php

@@ -73,45 +73,6 @@ abstract class ProductVersion implements ActiveRecordInterface
      */
     protected $ref;
 
-    /**
-     * The value for the price field.
-     * @var        double
-     */
-    protected $price;
-
-    /**
-     * The value for the price2 field.
-     * @var        double
-     */
-    protected $price2;
-
-    /**
-     * The value for the ecotax field.
-     * @var        double
-     */
-    protected $ecotax;
-
-    /**
-     * The value for the newness field.
-     * Note: this column has a database default value of: 0
-     * @var        int
-     */
-    protected $newness;
-
-    /**
-     * The value for the promo field.
-     * Note: this column has a database default value of: 0
-     * @var        int
-     */
-    protected $promo;
-
-    /**
-     * The value for the quantity field.
-     * Note: this column has a database default value of: 0
-     * @var        int
-     */
-    protected $quantity;
-
     /**
      * The value for the visible field.
      * Note: this column has a database default value of: 0
@@ -119,12 +80,6 @@ abstract class ProductVersion implements ActiveRecordInterface
      */
     protected $visible;
 
-    /**
-     * The value for the weight field.
-     * @var        double
-     */
-    protected $weight;
-
     /**
      * The value for the position field.
      * @var        int
@@ -183,9 +138,6 @@ abstract class ProductVersion implements ActiveRecordInterface
      */
     public function applyDefaultValues()
     {
-        $this->newness = 0;
-        $this->promo = 0;
-        $this->quantity = 0;
         $this->visible = 0;
         $this->version = 0;
     }
@@ -479,72 +431,6 @@ abstract class ProductVersion implements ActiveRecordInterface
         return $this->ref;
     }
 
-    /**
-     * Get the [price] column value.
-     *
-     * @return   double
-     */
-    public function getPrice()
-    {
-
-        return $this->price;
-    }
-
-    /**
-     * Get the [price2] column value.
-     *
-     * @return   double
-     */
-    public function getPrice2()
-    {
-
-        return $this->price2;
-    }
-
-    /**
-     * Get the [ecotax] column value.
-     *
-     * @return   double
-     */
-    public function getEcotax()
-    {
-
-        return $this->ecotax;
-    }
-
-    /**
-     * Get the [newness] column value.
-     *
-     * @return   int
-     */
-    public function getNewness()
-    {
-
-        return $this->newness;
-    }
-
-    /**
-     * Get the [promo] column value.
-     *
-     * @return   int
-     */
-    public function getPromo()
-    {
-
-        return $this->promo;
-    }
-
-    /**
-     * Get the [quantity] column value.
-     *
-     * @return   int
-     */
-    public function getQuantity()
-    {
-
-        return $this->quantity;
-    }
-
     /**
      * Get the [visible] column value.
      *
@@ -556,17 +442,6 @@ abstract class ProductVersion implements ActiveRecordInterface
         return $this->visible;
     }
 
-    /**
-     * Get the [weight] column value.
-     *
-     * @return   double
-     */
-    public function getWeight()
-    {
-
-        return $this->weight;
-    }
-
     /**
      * Get the [position] column value.
      *
@@ -727,132 +602,6 @@ abstract class ProductVersion implements ActiveRecordInterface
         return $this;
     } // setRef()
 
-    /**
-     * Set the value of [price] column.
-     *
-     * @param      double $v new value
-     * @return   \Thelia\Model\ProductVersion The current object (for fluent API support)
-     */
-    public function setPrice($v)
-    {
-        if ($v !== null) {
-            $v = (double) $v;
-        }
-
-        if ($this->price !== $v) {
-            $this->price = $v;
-            $this->modifiedColumns[] = ProductVersionTableMap::PRICE;
-        }
-
-
-        return $this;
-    } // setPrice()
-
-    /**
-     * Set the value of [price2] column.
-     *
-     * @param      double $v new value
-     * @return   \Thelia\Model\ProductVersion The current object (for fluent API support)
-     */
-    public function setPrice2($v)
-    {
-        if ($v !== null) {
-            $v = (double) $v;
-        }
-
-        if ($this->price2 !== $v) {
-            $this->price2 = $v;
-            $this->modifiedColumns[] = ProductVersionTableMap::PRICE2;
-        }
-
-
-        return $this;
-    } // setPrice2()
-
-    /**
-     * Set the value of [ecotax] column.
-     *
-     * @param      double $v new value
-     * @return   \Thelia\Model\ProductVersion The current object (for fluent API support)
-     */
-    public function setEcotax($v)
-    {
-        if ($v !== null) {
-            $v = (double) $v;
-        }
-
-        if ($this->ecotax !== $v) {
-            $this->ecotax = $v;
-            $this->modifiedColumns[] = ProductVersionTableMap::ECOTAX;
-        }
-
-
-        return $this;
-    } // setEcotax()
-
-    /**
-     * Set the value of [newness] column.
-     *
-     * @param      int $v new value
-     * @return   \Thelia\Model\ProductVersion The current object (for fluent API support)
-     */
-    public function setNewness($v)
-    {
-        if ($v !== null) {
-            $v = (int) $v;
-        }
-
-        if ($this->newness !== $v) {
-            $this->newness = $v;
-            $this->modifiedColumns[] = ProductVersionTableMap::NEWNESS;
-        }
-
-
-        return $this;
-    } // setNewness()
-
-    /**
-     * Set the value of [promo] column.
-     *
-     * @param      int $v new value
-     * @return   \Thelia\Model\ProductVersion The current object (for fluent API support)
-     */
-    public function setPromo($v)
-    {
-        if ($v !== null) {
-            $v = (int) $v;
-        }
-
-        if ($this->promo !== $v) {
-            $this->promo = $v;
-            $this->modifiedColumns[] = ProductVersionTableMap::PROMO;
-        }
-
-
-        return $this;
-    } // setPromo()
-
-    /**
-     * Set the value of [quantity] column.
-     *
-     * @param      int $v new value
-     * @return   \Thelia\Model\ProductVersion The current object (for fluent API support)
-     */
-    public function setQuantity($v)
-    {
-        if ($v !== null) {
-            $v = (int) $v;
-        }
-
-        if ($this->quantity !== $v) {
-            $this->quantity = $v;
-            $this->modifiedColumns[] = ProductVersionTableMap::QUANTITY;
-        }
-
-
-        return $this;
-    } // setQuantity()
-
     /**
      * Set the value of [visible] column.
      *
@@ -874,27 +623,6 @@ abstract class ProductVersion implements ActiveRecordInterface
         return $this;
     } // setVisible()
 
-    /**
-     * Set the value of [weight] column.
-     *
-     * @param      double $v new value
-     * @return   \Thelia\Model\ProductVersion The current object (for fluent API support)
-     */
-    public function setWeight($v)
-    {
-        if ($v !== null) {
-            $v = (double) $v;
-        }
-
-        if ($this->weight !== $v) {
-            $this->weight = $v;
-            $this->modifiedColumns[] = ProductVersionTableMap::WEIGHT;
-        }
-
-
-        return $this;
-    } // setWeight()
-
     /**
      * Set the value of [position] column.
      *
@@ -1031,18 +759,6 @@ abstract class ProductVersion implements ActiveRecordInterface
      */
     public function hasOnlyDefaultValues()
     {
-            if ($this->newness !== 0) {
-                return false;
-            }
-
-            if ($this->promo !== 0) {
-                return false;
-            }
-
-            if ($this->quantity !== 0) {
-                return false;
-            }
-
             if ($this->visible !== 0) {
                 return false;
             }
@@ -1087,55 +803,34 @@ abstract class ProductVersion implements ActiveRecordInterface
             $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ProductVersionTableMap::translateFieldName('Ref', TableMap::TYPE_PHPNAME, $indexType)];
             $this->ref = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ProductVersionTableMap::translateFieldName('Price', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ProductVersionTableMap::translateFieldName('Visible', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->price = (null !== $col) ? (double) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ProductVersionTableMap::translateFieldName('Price2', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->price2 = (null !== $col) ? (double) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ProductVersionTableMap::translateFieldName('Ecotax', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->ecotax = (null !== $col) ? (double) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : ProductVersionTableMap::translateFieldName('Newness', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->newness = (null !== $col) ? (int) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : ProductVersionTableMap::translateFieldName('Promo', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->promo = (null !== $col) ? (int) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : ProductVersionTableMap::translateFieldName('Quantity', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->quantity = (null !== $col) ? (int) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : ProductVersionTableMap::translateFieldName('Visible', TableMap::TYPE_PHPNAME, $indexType)];
             $this->visible = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : ProductVersionTableMap::translateFieldName('Weight', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ProductVersionTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->weight = (null !== $col) ? (double) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : ProductVersionTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)];
             $this->position = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 12 + $startcol : ProductVersionTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ProductVersionTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
             $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : ProductVersionTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : ProductVersionTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
             $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : ProductVersionTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : ProductVersionTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)];
             $this->version = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 15 + $startcol : ProductVersionTableMap::translateFieldName('VersionCreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : ProductVersionTableMap::translateFieldName('VersionCreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
             $this->version_created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 16 + $startcol : ProductVersionTableMap::translateFieldName('VersionCreatedBy', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : ProductVersionTableMap::translateFieldName('VersionCreatedBy', TableMap::TYPE_PHPNAME, $indexType)];
             $this->version_created_by = (null !== $col) ? (string) $col : null;
             $this->resetModified();
 
@@ -1145,7 +840,7 @@ abstract class ProductVersion implements ActiveRecordInterface
                 $this->ensureConsistency();
             }
 
-            return $startcol + 17; // 17 = ProductVersionTableMap::NUM_HYDRATE_COLUMNS.
+            return $startcol + 10; // 10 = ProductVersionTableMap::NUM_HYDRATE_COLUMNS.
 
         } catch (Exception $e) {
             throw new PropelException("Error populating \Thelia\Model\ProductVersion object", 0, $e);
@@ -1375,30 +1070,9 @@ abstract class ProductVersion implements ActiveRecordInterface
         if ($this->isColumnModified(ProductVersionTableMap::REF)) {
             $modifiedColumns[':p' . $index++]  = 'REF';
         }
-        if ($this->isColumnModified(ProductVersionTableMap::PRICE)) {
-            $modifiedColumns[':p' . $index++]  = 'PRICE';
-        }
-        if ($this->isColumnModified(ProductVersionTableMap::PRICE2)) {
-            $modifiedColumns[':p' . $index++]  = 'PRICE2';
-        }
-        if ($this->isColumnModified(ProductVersionTableMap::ECOTAX)) {
-            $modifiedColumns[':p' . $index++]  = 'ECOTAX';
-        }
-        if ($this->isColumnModified(ProductVersionTableMap::NEWNESS)) {
-            $modifiedColumns[':p' . $index++]  = 'NEWNESS';
-        }
-        if ($this->isColumnModified(ProductVersionTableMap::PROMO)) {
-            $modifiedColumns[':p' . $index++]  = 'PROMO';
-        }
-        if ($this->isColumnModified(ProductVersionTableMap::QUANTITY)) {
-            $modifiedColumns[':p' . $index++]  = 'QUANTITY';
-        }
         if ($this->isColumnModified(ProductVersionTableMap::VISIBLE)) {
             $modifiedColumns[':p' . $index++]  = 'VISIBLE';
         }
-        if ($this->isColumnModified(ProductVersionTableMap::WEIGHT)) {
-            $modifiedColumns[':p' . $index++]  = 'WEIGHT';
-        }
         if ($this->isColumnModified(ProductVersionTableMap::POSITION)) {
             $modifiedColumns[':p' . $index++]  = 'POSITION';
         }
@@ -1437,30 +1111,9 @@ abstract class ProductVersion implements ActiveRecordInterface
                     case 'REF':
                         $stmt->bindValue($identifier, $this->ref, PDO::PARAM_STR);
                         break;
-                    case 'PRICE':
-                        $stmt->bindValue($identifier, $this->price, PDO::PARAM_STR);
-                        break;
-                    case 'PRICE2':
-                        $stmt->bindValue($identifier, $this->price2, PDO::PARAM_STR);
-                        break;
-                    case 'ECOTAX':
-                        $stmt->bindValue($identifier, $this->ecotax, PDO::PARAM_STR);
-                        break;
-                    case 'NEWNESS':
-                        $stmt->bindValue($identifier, $this->newness, PDO::PARAM_INT);
-                        break;
-                    case 'PROMO':
-                        $stmt->bindValue($identifier, $this->promo, PDO::PARAM_INT);
-                        break;
-                    case 'QUANTITY':
-                        $stmt->bindValue($identifier, $this->quantity, PDO::PARAM_INT);
-                        break;
                     case 'VISIBLE':
                         $stmt->bindValue($identifier, $this->visible, PDO::PARAM_INT);
                         break;
-                    case 'WEIGHT':
-                        $stmt->bindValue($identifier, $this->weight, PDO::PARAM_STR);
-                        break;
                     case 'POSITION':
                         $stmt->bindValue($identifier, $this->position, PDO::PARAM_INT);
                         break;
@@ -1544,45 +1197,24 @@ abstract class ProductVersion implements ActiveRecordInterface
                 return $this->getRef();
                 break;
             case 3:
-                return $this->getPrice();
-                break;
-            case 4:
-                return $this->getPrice2();
-                break;
-            case 5:
-                return $this->getEcotax();
-                break;
-            case 6:
-                return $this->getNewness();
-                break;
-            case 7:
-                return $this->getPromo();
-                break;
-            case 8:
-                return $this->getQuantity();
-                break;
-            case 9:
                 return $this->getVisible();
                 break;
-            case 10:
+            case 4:
-                return $this->getWeight();
-                break;
-            case 11:
                 return $this->getPosition();
                 break;
-            case 12:
+            case 5:
                 return $this->getCreatedAt();
                 break;
-            case 13:
+            case 6:
                 return $this->getUpdatedAt();
                 break;
-            case 14:
+            case 7:
                 return $this->getVersion();
                 break;
-            case 15:
+            case 8:
                 return $this->getVersionCreatedAt();
                 break;
-            case 16:
+            case 9:
                 return $this->getVersionCreatedBy();
                 break;
             default:
@@ -1617,20 +1249,13 @@ abstract class ProductVersion implements ActiveRecordInterface
             $keys[0] => $this->getId(),
             $keys[1] => $this->getTaxRuleId(),
             $keys[2] => $this->getRef(),
-            $keys[3] => $this->getPrice(),
+            $keys[3] => $this->getVisible(),
-            $keys[4] => $this->getPrice2(),
+            $keys[4] => $this->getPosition(),
-            $keys[5] => $this->getEcotax(),
+            $keys[5] => $this->getCreatedAt(),
-            $keys[6] => $this->getNewness(),
+            $keys[6] => $this->getUpdatedAt(),
-            $keys[7] => $this->getPromo(),
+            $keys[7] => $this->getVersion(),
-            $keys[8] => $this->getQuantity(),
+            $keys[8] => $this->getVersionCreatedAt(),
-            $keys[9] => $this->getVisible(),
+            $keys[9] => $this->getVersionCreatedBy(),
-            $keys[10] => $this->getWeight(),
-            $keys[11] => $this->getPosition(),
-            $keys[12] => $this->getCreatedAt(),
-            $keys[13] => $this->getUpdatedAt(),
-            $keys[14] => $this->getVersion(),
-            $keys[15] => $this->getVersionCreatedAt(),
-            $keys[16] => $this->getVersionCreatedBy(),
         );
         $virtualColumns = $this->virtualColumns;
         foreach($virtualColumns as $key => $virtualColumn)
@@ -1686,45 +1311,24 @@ abstract class ProductVersion implements ActiveRecordInterface
                 $this->setRef($value);
                 break;
             case 3:
-                $this->setPrice($value);
-                break;
-            case 4:
-                $this->setPrice2($value);
-                break;
-            case 5:
-                $this->setEcotax($value);
-                break;
-            case 6:
-                $this->setNewness($value);
-                break;
-            case 7:
-                $this->setPromo($value);
-                break;
-            case 8:
-                $this->setQuantity($value);
-                break;
-            case 9:
                 $this->setVisible($value);
                 break;
-            case 10:
+            case 4:
-                $this->setWeight($value);
-                break;
-            case 11:
                 $this->setPosition($value);
                 break;
-            case 12:
+            case 5:
                 $this->setCreatedAt($value);
                 break;
-            case 13:
+            case 6:
                 $this->setUpdatedAt($value);
                 break;
-            case 14:
+            case 7:
                 $this->setVersion($value);
                 break;
-            case 15:
+            case 8:
                 $this->setVersionCreatedAt($value);
                 break;
-            case 16:
+            case 9:
                 $this->setVersionCreatedBy($value);
                 break;
         } // switch()
@@ -1754,20 +1358,13 @@ abstract class ProductVersion implements ActiveRecordInterface
         if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
         if (array_key_exists($keys[1], $arr)) $this->setTaxRuleId($arr[$keys[1]]);
         if (array_key_exists($keys[2], $arr)) $this->setRef($arr[$keys[2]]);
-        if (array_key_exists($keys[3], $arr)) $this->setPrice($arr[$keys[3]]);
+        if (array_key_exists($keys[3], $arr)) $this->setVisible($arr[$keys[3]]);
-        if (array_key_exists($keys[4], $arr)) $this->setPrice2($arr[$keys[4]]);
+        if (array_key_exists($keys[4], $arr)) $this->setPosition($arr[$keys[4]]);
-        if (array_key_exists($keys[5], $arr)) $this->setEcotax($arr[$keys[5]]);
+        if (array_key_exists($keys[5], $arr)) $this->setCreatedAt($arr[$keys[5]]);
-        if (array_key_exists($keys[6], $arr)) $this->setNewness($arr[$keys[6]]);
+        if (array_key_exists($keys[6], $arr)) $this->setUpdatedAt($arr[$keys[6]]);
-        if (array_key_exists($keys[7], $arr)) $this->setPromo($arr[$keys[7]]);
+        if (array_key_exists($keys[7], $arr)) $this->setVersion($arr[$keys[7]]);
-        if (array_key_exists($keys[8], $arr)) $this->setQuantity($arr[$keys[8]]);
+        if (array_key_exists($keys[8], $arr)) $this->setVersionCreatedAt($arr[$keys[8]]);
-        if (array_key_exists($keys[9], $arr)) $this->setVisible($arr[$keys[9]]);
+        if (array_key_exists($keys[9], $arr)) $this->setVersionCreatedBy($arr[$keys[9]]);
-        if (array_key_exists($keys[10], $arr)) $this->setWeight($arr[$keys[10]]);
-        if (array_key_exists($keys[11], $arr)) $this->setPosition($arr[$keys[11]]);
-        if (array_key_exists($keys[12], $arr)) $this->setCreatedAt($arr[$keys[12]]);
-        if (array_key_exists($keys[13], $arr)) $this->setUpdatedAt($arr[$keys[13]]);
-        if (array_key_exists($keys[14], $arr)) $this->setVersion($arr[$keys[14]]);
-        if (array_key_exists($keys[15], $arr)) $this->setVersionCreatedAt($arr[$keys[15]]);
-        if (array_key_exists($keys[16], $arr)) $this->setVersionCreatedBy($arr[$keys[16]]);
     }
 
     /**
@@ -1782,14 +1379,7 @@ abstract class ProductVersion implements ActiveRecordInterface
         if ($this->isColumnModified(ProductVersionTableMap::ID)) $criteria->add(ProductVersionTableMap::ID, $this->id);
         if ($this->isColumnModified(ProductVersionTableMap::TAX_RULE_ID)) $criteria->add(ProductVersionTableMap::TAX_RULE_ID, $this->tax_rule_id);
         if ($this->isColumnModified(ProductVersionTableMap::REF)) $criteria->add(ProductVersionTableMap::REF, $this->ref);
-        if ($this->isColumnModified(ProductVersionTableMap::PRICE)) $criteria->add(ProductVersionTableMap::PRICE, $this->price);
-        if ($this->isColumnModified(ProductVersionTableMap::PRICE2)) $criteria->add(ProductVersionTableMap::PRICE2, $this->price2);
-        if ($this->isColumnModified(ProductVersionTableMap::ECOTAX)) $criteria->add(ProductVersionTableMap::ECOTAX, $this->ecotax);
-        if ($this->isColumnModified(ProductVersionTableMap::NEWNESS)) $criteria->add(ProductVersionTableMap::NEWNESS, $this->newness);
-        if ($this->isColumnModified(ProductVersionTableMap::PROMO)) $criteria->add(ProductVersionTableMap::PROMO, $this->promo);
-        if ($this->isColumnModified(ProductVersionTableMap::QUANTITY)) $criteria->add(ProductVersionTableMap::QUANTITY, $this->quantity);
         if ($this->isColumnModified(ProductVersionTableMap::VISIBLE)) $criteria->add(ProductVersionTableMap::VISIBLE, $this->visible);
-        if ($this->isColumnModified(ProductVersionTableMap::WEIGHT)) $criteria->add(ProductVersionTableMap::WEIGHT, $this->weight);
         if ($this->isColumnModified(ProductVersionTableMap::POSITION)) $criteria->add(ProductVersionTableMap::POSITION, $this->position);
         if ($this->isColumnModified(ProductVersionTableMap::CREATED_AT)) $criteria->add(ProductVersionTableMap::CREATED_AT, $this->created_at);
         if ($this->isColumnModified(ProductVersionTableMap::UPDATED_AT)) $criteria->add(ProductVersionTableMap::UPDATED_AT, $this->updated_at);
@@ -1869,14 +1459,7 @@ abstract class ProductVersion implements ActiveRecordInterface
         $copyObj->setId($this->getId());
         $copyObj->setTaxRuleId($this->getTaxRuleId());
         $copyObj->setRef($this->getRef());
-        $copyObj->setPrice($this->getPrice());
-        $copyObj->setPrice2($this->getPrice2());
-        $copyObj->setEcotax($this->getEcotax());
-        $copyObj->setNewness($this->getNewness());
-        $copyObj->setPromo($this->getPromo());
-        $copyObj->setQuantity($this->getQuantity());
         $copyObj->setVisible($this->getVisible());
-        $copyObj->setWeight($this->getWeight());
         $copyObj->setPosition($this->getPosition());
         $copyObj->setCreatedAt($this->getCreatedAt());
         $copyObj->setUpdatedAt($this->getUpdatedAt());
@@ -1969,14 +1552,7 @@ abstract class ProductVersion implements ActiveRecordInterface
         $this->id = null;
         $this->tax_rule_id = null;
         $this->ref = null;
-        $this->price = null;
-        $this->price2 = null;
-        $this->ecotax = null;
-        $this->newness = null;
-        $this->promo = null;
-        $this->quantity = null;
         $this->visible = null;
-        $this->weight = null;
         $this->position = null;
         $this->created_at = null;
         $this->updated_at = null;

core/lib/Thelia/Model/Base/ProductVersionQuery.php

@@ -24,14 +24,7 @@ use Thelia\Model\Map\ProductVersionTableMap;
  * @method     ChildProductVersionQuery orderById($order = Criteria::ASC) Order by the id column
  * @method     ChildProductVersionQuery orderByTaxRuleId($order = Criteria::ASC) Order by the tax_rule_id column
  * @method     ChildProductVersionQuery orderByRef($order = Criteria::ASC) Order by the ref column
- * @method     ChildProductVersionQuery orderByPrice($order = Criteria::ASC) Order by the price column
- * @method     ChildProductVersionQuery orderByPrice2($order = Criteria::ASC) Order by the price2 column
- * @method     ChildProductVersionQuery orderByEcotax($order = Criteria::ASC) Order by the ecotax column
- * @method     ChildProductVersionQuery orderByNewness($order = Criteria::ASC) Order by the newness column
- * @method     ChildProductVersionQuery orderByPromo($order = Criteria::ASC) Order by the promo column
- * @method     ChildProductVersionQuery orderByQuantity($order = Criteria::ASC) Order by the quantity column
  * @method     ChildProductVersionQuery orderByVisible($order = Criteria::ASC) Order by the visible column
- * @method     ChildProductVersionQuery orderByWeight($order = Criteria::ASC) Order by the weight column
  * @method     ChildProductVersionQuery orderByPosition($order = Criteria::ASC) Order by the position column
  * @method     ChildProductVersionQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
  * @method     ChildProductVersionQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
@@ -42,14 +35,7 @@ use Thelia\Model\Map\ProductVersionTableMap;
  * @method     ChildProductVersionQuery groupById() Group by the id column
  * @method     ChildProductVersionQuery groupByTaxRuleId() Group by the tax_rule_id column
  * @method     ChildProductVersionQuery groupByRef() Group by the ref column
- * @method     ChildProductVersionQuery groupByPrice() Group by the price column
- * @method     ChildProductVersionQuery groupByPrice2() Group by the price2 column
- * @method     ChildProductVersionQuery groupByEcotax() Group by the ecotax column
- * @method     ChildProductVersionQuery groupByNewness() Group by the newness column
- * @method     ChildProductVersionQuery groupByPromo() Group by the promo column
- * @method     ChildProductVersionQuery groupByQuantity() Group by the quantity column
  * @method     ChildProductVersionQuery groupByVisible() Group by the visible column
- * @method     ChildProductVersionQuery groupByWeight() Group by the weight column
  * @method     ChildProductVersionQuery groupByPosition() Group by the position column
  * @method     ChildProductVersionQuery groupByCreatedAt() Group by the created_at column
  * @method     ChildProductVersionQuery groupByUpdatedAt() Group by the updated_at column
@@ -71,14 +57,7 @@ use Thelia\Model\Map\ProductVersionTableMap;
  * @method     ChildProductVersion findOneById(int $id) Return the first ChildProductVersion filtered by the id column
  * @method     ChildProductVersion findOneByTaxRuleId(int $tax_rule_id) Return the first ChildProductVersion filtered by the tax_rule_id column
  * @method     ChildProductVersion findOneByRef(string $ref) Return the first ChildProductVersion filtered by the ref column
- * @method     ChildProductVersion findOneByPrice(double $price) Return the first ChildProductVersion filtered by the price column
- * @method     ChildProductVersion findOneByPrice2(double $price2) Return the first ChildProductVersion filtered by the price2 column
- * @method     ChildProductVersion findOneByEcotax(double $ecotax) Return the first ChildProductVersion filtered by the ecotax column
- * @method     ChildProductVersion findOneByNewness(int $newness) Return the first ChildProductVersion filtered by the newness column
- * @method     ChildProductVersion findOneByPromo(int $promo) Return the first ChildProductVersion filtered by the promo column
- * @method     ChildProductVersion findOneByQuantity(int $quantity) Return the first ChildProductVersion filtered by the quantity column
  * @method     ChildProductVersion findOneByVisible(int $visible) Return the first ChildProductVersion filtered by the visible column
- * @method     ChildProductVersion findOneByWeight(double $weight) Return the first ChildProductVersion filtered by the weight column
  * @method     ChildProductVersion findOneByPosition(int $position) Return the first ChildProductVersion filtered by the position column
  * @method     ChildProductVersion findOneByCreatedAt(string $created_at) Return the first ChildProductVersion filtered by the created_at column
  * @method     ChildProductVersion findOneByUpdatedAt(string $updated_at) Return the first ChildProductVersion filtered by the updated_at column
@@ -89,14 +68,7 @@ use Thelia\Model\Map\ProductVersionTableMap;
  * @method     array findById(int $id) Return ChildProductVersion objects filtered by the id column
  * @method     array findByTaxRuleId(int $tax_rule_id) Return ChildProductVersion objects filtered by the tax_rule_id column
  * @method     array findByRef(string $ref) Return ChildProductVersion objects filtered by the ref column
- * @method     array findByPrice(double $price) Return ChildProductVersion objects filtered by the price column
- * @method     array findByPrice2(double $price2) Return ChildProductVersion objects filtered by the price2 column
- * @method     array findByEcotax(double $ecotax) Return ChildProductVersion objects filtered by the ecotax column
- * @method     array findByNewness(int $newness) Return ChildProductVersion objects filtered by the newness column
- * @method     array findByPromo(int $promo) Return ChildProductVersion objects filtered by the promo column
- * @method     array findByQuantity(int $quantity) Return ChildProductVersion objects filtered by the quantity column
  * @method     array findByVisible(int $visible) Return ChildProductVersion objects filtered by the visible column
- * @method     array findByWeight(double $weight) Return ChildProductVersion objects filtered by the weight column
  * @method     array findByPosition(int $position) Return ChildProductVersion objects filtered by the position column
  * @method     array findByCreatedAt(string $created_at) Return ChildProductVersion objects filtered by the created_at column
  * @method     array findByUpdatedAt(string $updated_at) Return ChildProductVersion objects filtered by the updated_at column
@@ -191,7 +163,7 @@ abstract class ProductVersionQuery extends ModelCriteria
      */
     protected function findPkSimple($key, $con)
     {
-        $sql = 'SELECT ID, TAX_RULE_ID, REF, PRICE, PRICE2, ECOTAX, NEWNESS, PROMO, QUANTITY, VISIBLE, WEIGHT, POSITION, CREATED_AT, UPDATED_AT, VERSION, VERSION_CREATED_AT, VERSION_CREATED_BY FROM product_version WHERE ID = :p0 AND VERSION = :p1';
+        $sql = 'SELECT ID, TAX_RULE_ID, REF, VISIBLE, POSITION, CREATED_AT, UPDATED_AT, VERSION, VERSION_CREATED_AT, VERSION_CREATED_BY FROM product_version WHERE ID = :p0 AND VERSION = :p1';
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT);
@@ -405,252 +377,6 @@ abstract class ProductVersionQuery extends ModelCriteria
         return $this->addUsingAlias(ProductVersionTableMap::REF, $ref, $comparison);
     }
 
-    /**
-     * Filter the query on the price column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByPrice(1234); // WHERE price = 1234
-     * $query->filterByPrice(array(12, 34)); // WHERE price IN (12, 34)
-     * $query->filterByPrice(array('min' => 12)); // WHERE price > 12
-     * </code>
-     *
-     * @param     mixed $price The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildProductVersionQuery The current query, for fluid interface
-     */
-    public function filterByPrice($price = null, $comparison = null)
-    {
-        if (is_array($price)) {
-            $useMinMax = false;
-            if (isset($price['min'])) {
-                $this->addUsingAlias(ProductVersionTableMap::PRICE, $price['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($price['max'])) {
-                $this->addUsingAlias(ProductVersionTableMap::PRICE, $price['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(ProductVersionTableMap::PRICE, $price, $comparison);
-    }
-
-    /**
-     * Filter the query on the price2 column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByPrice2(1234); // WHERE price2 = 1234
-     * $query->filterByPrice2(array(12, 34)); // WHERE price2 IN (12, 34)
-     * $query->filterByPrice2(array('min' => 12)); // WHERE price2 > 12
-     * </code>
-     *
-     * @param     mixed $price2 The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildProductVersionQuery The current query, for fluid interface
-     */
-    public function filterByPrice2($price2 = null, $comparison = null)
-    {
-        if (is_array($price2)) {
-            $useMinMax = false;
-            if (isset($price2['min'])) {
-                $this->addUsingAlias(ProductVersionTableMap::PRICE2, $price2['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($price2['max'])) {
-                $this->addUsingAlias(ProductVersionTableMap::PRICE2, $price2['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(ProductVersionTableMap::PRICE2, $price2, $comparison);
-    }
-
-    /**
-     * Filter the query on the ecotax column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByEcotax(1234); // WHERE ecotax = 1234
-     * $query->filterByEcotax(array(12, 34)); // WHERE ecotax IN (12, 34)
-     * $query->filterByEcotax(array('min' => 12)); // WHERE ecotax > 12
-     * </code>
-     *
-     * @param     mixed $ecotax The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildProductVersionQuery The current query, for fluid interface
-     */
-    public function filterByEcotax($ecotax = null, $comparison = null)
-    {
-        if (is_array($ecotax)) {
-            $useMinMax = false;
-            if (isset($ecotax['min'])) {
-                $this->addUsingAlias(ProductVersionTableMap::ECOTAX, $ecotax['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($ecotax['max'])) {
-                $this->addUsingAlias(ProductVersionTableMap::ECOTAX, $ecotax['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(ProductVersionTableMap::ECOTAX, $ecotax, $comparison);
-    }
-
-    /**
-     * Filter the query on the newness column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByNewness(1234); // WHERE newness = 1234
-     * $query->filterByNewness(array(12, 34)); // WHERE newness IN (12, 34)
-     * $query->filterByNewness(array('min' => 12)); // WHERE newness > 12
-     * </code>
-     *
-     * @param     mixed $newness The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildProductVersionQuery The current query, for fluid interface
-     */
-    public function filterByNewness($newness = null, $comparison = null)
-    {
-        if (is_array($newness)) {
-            $useMinMax = false;
-            if (isset($newness['min'])) {
-                $this->addUsingAlias(ProductVersionTableMap::NEWNESS, $newness['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($newness['max'])) {
-                $this->addUsingAlias(ProductVersionTableMap::NEWNESS, $newness['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(ProductVersionTableMap::NEWNESS, $newness, $comparison);
-    }
-
-    /**
-     * Filter the query on the promo column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByPromo(1234); // WHERE promo = 1234
-     * $query->filterByPromo(array(12, 34)); // WHERE promo IN (12, 34)
-     * $query->filterByPromo(array('min' => 12)); // WHERE promo > 12
-     * </code>
-     *
-     * @param     mixed $promo The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildProductVersionQuery The current query, for fluid interface
-     */
-    public function filterByPromo($promo = null, $comparison = null)
-    {
-        if (is_array($promo)) {
-            $useMinMax = false;
-            if (isset($promo['min'])) {
-                $this->addUsingAlias(ProductVersionTableMap::PROMO, $promo['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($promo['max'])) {
-                $this->addUsingAlias(ProductVersionTableMap::PROMO, $promo['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(ProductVersionTableMap::PROMO, $promo, $comparison);
-    }
-
-    /**
-     * Filter the query on the quantity column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByQuantity(1234); // WHERE quantity = 1234
-     * $query->filterByQuantity(array(12, 34)); // WHERE quantity IN (12, 34)
-     * $query->filterByQuantity(array('min' => 12)); // WHERE quantity > 12
-     * </code>
-     *
-     * @param     mixed $quantity The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildProductVersionQuery The current query, for fluid interface
-     */
-    public function filterByQuantity($quantity = null, $comparison = null)
-    {
-        if (is_array($quantity)) {
-            $useMinMax = false;
-            if (isset($quantity['min'])) {
-                $this->addUsingAlias(ProductVersionTableMap::QUANTITY, $quantity['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($quantity['max'])) {
-                $this->addUsingAlias(ProductVersionTableMap::QUANTITY, $quantity['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(ProductVersionTableMap::QUANTITY, $quantity, $comparison);
-    }
-
     /**
      * Filter the query on the visible column
      *
@@ -692,47 +418,6 @@ abstract class ProductVersionQuery extends ModelCriteria
         return $this->addUsingAlias(ProductVersionTableMap::VISIBLE, $visible, $comparison);
     }
 
-    /**
-     * Filter the query on the weight column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByWeight(1234); // WHERE weight = 1234
-     * $query->filterByWeight(array(12, 34)); // WHERE weight IN (12, 34)
-     * $query->filterByWeight(array('min' => 12)); // WHERE weight > 12
-     * </code>
-     *
-     * @param     mixed $weight The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildProductVersionQuery The current query, for fluid interface
-     */
-    public function filterByWeight($weight = null, $comparison = null)
-    {
-        if (is_array($weight)) {
-            $useMinMax = false;
-            if (isset($weight['min'])) {
-                $this->addUsingAlias(ProductVersionTableMap::WEIGHT, $weight['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($weight['max'])) {
-                $this->addUsingAlias(ProductVersionTableMap::WEIGHT, $weight['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(ProductVersionTableMap::WEIGHT, $weight, $comparison);
-    }
-
     /**
      * Filter the query on the position column
      *

core/lib/Thelia/Model/Base/StockQuery.php

@@ -22,18 +22,22 @@ use Thelia\Model\Map\StockTableMap;
  *
  *
  * @method     ChildStockQuery orderById($order = Criteria::ASC) Order by the id column
- * @method     ChildStockQuery orderByCombinationId($order = Criteria::ASC) Order by the combination_id column
  * @method     ChildStockQuery orderByProductId($order = Criteria::ASC) Order by the product_id column
  * @method     ChildStockQuery orderByIncrease($order = Criteria::ASC) Order by the increase column
  * @method     ChildStockQuery orderByQuantity($order = Criteria::ASC) Order by the quantity column
+ * @method     ChildStockQuery orderByPromo($order = Criteria::ASC) Order by the promo column
+ * @method     ChildStockQuery orderByNewness($order = Criteria::ASC) Order by the newness column
+ * @method     ChildStockQuery orderByWeight($order = Criteria::ASC) Order by the weight column
  * @method     ChildStockQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
  * @method     ChildStockQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
  *
  * @method     ChildStockQuery groupById() Group by the id column
- * @method     ChildStockQuery groupByCombinationId() Group by the combination_id column
  * @method     ChildStockQuery groupByProductId() Group by the product_id column
  * @method     ChildStockQuery groupByIncrease() Group by the increase column
  * @method     ChildStockQuery groupByQuantity() Group by the quantity column
+ * @method     ChildStockQuery groupByPromo() Group by the promo column
+ * @method     ChildStockQuery groupByNewness() Group by the newness column
+ * @method     ChildStockQuery groupByWeight() Group by the weight column
  * @method     ChildStockQuery groupByCreatedAt() Group by the created_at column
  * @method     ChildStockQuery groupByUpdatedAt() Group by the updated_at column
  *
@@ -41,30 +45,42 @@ use Thelia\Model\Map\StockTableMap;
  * @method     ChildStockQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
  * @method     ChildStockQuery innerJoin($relation) Adds a INNER JOIN clause to the query
  *
- * @method     ChildStockQuery leftJoinCombination($relationAlias = null) Adds a LEFT JOIN clause to the query using the Combination relation
- * @method     ChildStockQuery rightJoinCombination($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Combination relation
- * @method     ChildStockQuery innerJoinCombination($relationAlias = null) Adds a INNER JOIN clause to the query using the Combination relation
- *
  * @method     ChildStockQuery leftJoinProduct($relationAlias = null) Adds a LEFT JOIN clause to the query using the Product relation
  * @method     ChildStockQuery rightJoinProduct($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Product relation
  * @method     ChildStockQuery innerJoinProduct($relationAlias = null) Adds a INNER JOIN clause to the query using the Product relation
  *
+ * @method     ChildStockQuery leftJoinAttributeCombination($relationAlias = null) Adds a LEFT JOIN clause to the query using the AttributeCombination relation
+ * @method     ChildStockQuery rightJoinAttributeCombination($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AttributeCombination relation
+ * @method     ChildStockQuery innerJoinAttributeCombination($relationAlias = null) Adds a INNER JOIN clause to the query using the AttributeCombination relation
+ *
+ * @method     ChildStockQuery leftJoinCartItem($relationAlias = null) Adds a LEFT JOIN clause to the query using the CartItem relation
+ * @method     ChildStockQuery rightJoinCartItem($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CartItem relation
+ * @method     ChildStockQuery innerJoinCartItem($relationAlias = null) Adds a INNER JOIN clause to the query using the CartItem relation
+ *
+ * @method     ChildStockQuery leftJoinProductPrice($relationAlias = null) Adds a LEFT JOIN clause to the query using the ProductPrice relation
+ * @method     ChildStockQuery rightJoinProductPrice($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ProductPrice relation
+ * @method     ChildStockQuery innerJoinProductPrice($relationAlias = null) Adds a INNER JOIN clause to the query using the ProductPrice relation
+ *
  * @method     ChildStock findOne(ConnectionInterface $con = null) Return the first ChildStock matching the query
  * @method     ChildStock findOneOrCreate(ConnectionInterface $con = null) Return the first ChildStock matching the query, or a new ChildStock object populated from the query conditions when no match is found
  *
  * @method     ChildStock findOneById(int $id) Return the first ChildStock filtered by the id column
- * @method     ChildStock findOneByCombinationId(int $combination_id) Return the first ChildStock filtered by the combination_id column
  * @method     ChildStock findOneByProductId(int $product_id) Return the first ChildStock filtered by the product_id column
  * @method     ChildStock findOneByIncrease(double $increase) Return the first ChildStock filtered by the increase column
  * @method     ChildStock findOneByQuantity(double $quantity) Return the first ChildStock filtered by the quantity column
+ * @method     ChildStock findOneByPromo(int $promo) Return the first ChildStock filtered by the promo column
+ * @method     ChildStock findOneByNewness(int $newness) Return the first ChildStock filtered by the newness column
+ * @method     ChildStock findOneByWeight(double $weight) Return the first ChildStock filtered by the weight column
  * @method     ChildStock findOneByCreatedAt(string $created_at) Return the first ChildStock filtered by the created_at column
  * @method     ChildStock findOneByUpdatedAt(string $updated_at) Return the first ChildStock filtered by the updated_at column
  *
  * @method     array findById(int $id) Return ChildStock objects filtered by the id column
- * @method     array findByCombinationId(int $combination_id) Return ChildStock objects filtered by the combination_id column
  * @method     array findByProductId(int $product_id) Return ChildStock objects filtered by the product_id column
  * @method     array findByIncrease(double $increase) Return ChildStock objects filtered by the increase column
  * @method     array findByQuantity(double $quantity) Return ChildStock objects filtered by the quantity column
+ * @method     array findByPromo(int $promo) Return ChildStock objects filtered by the promo column
+ * @method     array findByNewness(int $newness) Return ChildStock objects filtered by the newness column
+ * @method     array findByWeight(double $weight) Return ChildStock objects filtered by the weight column
  * @method     array findByCreatedAt(string $created_at) Return ChildStock objects filtered by the created_at column
  * @method     array findByUpdatedAt(string $updated_at) Return ChildStock objects filtered by the updated_at column
  *
@@ -155,7 +171,7 @@ abstract class StockQuery extends ModelCriteria
      */
     protected function findPkSimple($key, $con)
     {
-        $sql = 'SELECT ID, COMBINATION_ID, PRODUCT_ID, INCREASE, QUANTITY, CREATED_AT, UPDATED_AT FROM stock WHERE ID = :p0';
+        $sql = 'SELECT ID, PRODUCT_ID, INCREASE, QUANTITY, PROMO, NEWNESS, WEIGHT, CREATED_AT, UPDATED_AT FROM stock WHERE ID = :p0';
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -285,49 +301,6 @@ abstract class StockQuery extends ModelCriteria
         return $this->addUsingAlias(StockTableMap::ID, $id, $comparison);
     }
 
-    /**
-     * Filter the query on the combination_id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByCombinationId(1234); // WHERE combination_id = 1234
-     * $query->filterByCombinationId(array(12, 34)); // WHERE combination_id IN (12, 34)
-     * $query->filterByCombinationId(array('min' => 12)); // WHERE combination_id > 12
-     * </code>
-     *
-     * @see       filterByCombination()
-     *
-     * @param     mixed $combinationId The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildStockQuery The current query, for fluid interface
-     */
-    public function filterByCombinationId($combinationId = null, $comparison = null)
-    {
-        if (is_array($combinationId)) {
-            $useMinMax = false;
-            if (isset($combinationId['min'])) {
-                $this->addUsingAlias(StockTableMap::COMBINATION_ID, $combinationId['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($combinationId['max'])) {
-                $this->addUsingAlias(StockTableMap::COMBINATION_ID, $combinationId['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(StockTableMap::COMBINATION_ID, $combinationId, $comparison);
-    }
-
     /**
      * Filter the query on the product_id column
      *
@@ -453,6 +426,129 @@ abstract class StockQuery extends ModelCriteria
         return $this->addUsingAlias(StockTableMap::QUANTITY, $quantity, $comparison);
     }
 
+    /**
+     * Filter the query on the promo column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByPromo(1234); // WHERE promo = 1234
+     * $query->filterByPromo(array(12, 34)); // WHERE promo IN (12, 34)
+     * $query->filterByPromo(array('min' => 12)); // WHERE promo > 12
+     * </code>
+     *
+     * @param     mixed $promo The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildStockQuery The current query, for fluid interface
+     */
+    public function filterByPromo($promo = null, $comparison = null)
+    {
+        if (is_array($promo)) {
+            $useMinMax = false;
+            if (isset($promo['min'])) {
+                $this->addUsingAlias(StockTableMap::PROMO, $promo['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($promo['max'])) {
+                $this->addUsingAlias(StockTableMap::PROMO, $promo['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(StockTableMap::PROMO, $promo, $comparison);
+    }
+
+    /**
+     * Filter the query on the newness column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByNewness(1234); // WHERE newness = 1234
+     * $query->filterByNewness(array(12, 34)); // WHERE newness IN (12, 34)
+     * $query->filterByNewness(array('min' => 12)); // WHERE newness > 12
+     * </code>
+     *
+     * @param     mixed $newness The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildStockQuery The current query, for fluid interface
+     */
+    public function filterByNewness($newness = null, $comparison = null)
+    {
+        if (is_array($newness)) {
+            $useMinMax = false;
+            if (isset($newness['min'])) {
+                $this->addUsingAlias(StockTableMap::NEWNESS, $newness['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($newness['max'])) {
+                $this->addUsingAlias(StockTableMap::NEWNESS, $newness['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(StockTableMap::NEWNESS, $newness, $comparison);
+    }
+
+    /**
+     * Filter the query on the weight column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByWeight(1234); // WHERE weight = 1234
+     * $query->filterByWeight(array(12, 34)); // WHERE weight IN (12, 34)
+     * $query->filterByWeight(array('min' => 12)); // WHERE weight > 12
+     * </code>
+     *
+     * @param     mixed $weight The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildStockQuery The current query, for fluid interface
+     */
+    public function filterByWeight($weight = null, $comparison = null)
+    {
+        if (is_array($weight)) {
+            $useMinMax = false;
+            if (isset($weight['min'])) {
+                $this->addUsingAlias(StockTableMap::WEIGHT, $weight['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($weight['max'])) {
+                $this->addUsingAlias(StockTableMap::WEIGHT, $weight['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(StockTableMap::WEIGHT, $weight, $comparison);
+    }
+
     /**
      * Filter the query on the created_at column
      *
@@ -539,81 +635,6 @@ abstract class StockQuery extends ModelCriteria
         return $this->addUsingAlias(StockTableMap::UPDATED_AT, $updatedAt, $comparison);
     }
 
-    /**
-     * Filter the query by a related \Thelia\Model\Combination object
-     *
-     * @param \Thelia\Model\Combination|ObjectCollection $combination The related object(s) to use as filter
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildStockQuery The current query, for fluid interface
-     */
-    public function filterByCombination($combination, $comparison = null)
-    {
-        if ($combination instanceof \Thelia\Model\Combination) {
-            return $this
-                ->addUsingAlias(StockTableMap::COMBINATION_ID, $combination->getId(), $comparison);
-        } elseif ($combination instanceof ObjectCollection) {
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-
-            return $this
-                ->addUsingAlias(StockTableMap::COMBINATION_ID, $combination->toKeyValue('PrimaryKey', 'Id'), $comparison);
-        } else {
-            throw new PropelException('filterByCombination() only accepts arguments of type \Thelia\Model\Combination or Collection');
-        }
-    }
-
-    /**
-     * Adds a JOIN clause to the query using the Combination relation
-     *
-     * @param     string $relationAlias optional alias for the relation
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return ChildStockQuery The current query, for fluid interface
-     */
-    public function joinCombination($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
-    {
-        $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('Combination');
-
-        // create a ModelJoin object for this join
-        $join = new ModelJoin();
-        $join->setJoinType($joinType);
-        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
-        if ($previousJoin = $this->getPreviousJoin()) {
-            $join->setPreviousJoin($previousJoin);
-        }
-
-        // add the ModelJoin to the current object
-        if ($relationAlias) {
-            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
-            $this->addJoinObject($join, $relationAlias);
-        } else {
-            $this->addJoinObject($join, 'Combination');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Use the Combination relation Combination object
-     *
-     * @see useQuery()
-     *
-     * @param     string $relationAlias optional alias for the relation,
-     *                                   to be used as main alias in the secondary query
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return   \Thelia\Model\CombinationQuery A secondary query class using the current class as primary query
-     */
-    public function useCombinationQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
-    {
-        return $this
-            ->joinCombination($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'Combination', '\Thelia\Model\CombinationQuery');
-    }
-
     /**
      * Filter the query by a related \Thelia\Model\Product object
      *
@@ -689,6 +710,225 @@ abstract class StockQuery extends ModelCriteria
             ->useQuery($relationAlias ? $relationAlias : 'Product', '\Thelia\Model\ProductQuery');
     }
 
+    /**
+     * Filter the query by a related \Thelia\Model\AttributeCombination object
+     *
+     * @param \Thelia\Model\AttributeCombination|ObjectCollection $attributeCombination  the related object to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildStockQuery The current query, for fluid interface
+     */
+    public function filterByAttributeCombination($attributeCombination, $comparison = null)
+    {
+        if ($attributeCombination instanceof \Thelia\Model\AttributeCombination) {
+            return $this
+                ->addUsingAlias(StockTableMap::ID, $attributeCombination->getStockId(), $comparison);
+        } elseif ($attributeCombination instanceof ObjectCollection) {
+            return $this
+                ->useAttributeCombinationQuery()
+                ->filterByPrimaryKeys($attributeCombination->getPrimaryKeys())
+                ->endUse();
+        } else {
+            throw new PropelException('filterByAttributeCombination() only accepts arguments of type \Thelia\Model\AttributeCombination or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the AttributeCombination relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return ChildStockQuery The current query, for fluid interface
+     */
+    public function joinAttributeCombination($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('AttributeCombination');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'AttributeCombination');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the AttributeCombination relation AttributeCombination object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return   \Thelia\Model\AttributeCombinationQuery A secondary query class using the current class as primary query
+     */
+    public function useAttributeCombinationQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        return $this
+            ->joinAttributeCombination($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'AttributeCombination', '\Thelia\Model\AttributeCombinationQuery');
+    }
+
+    /**
+     * Filter the query by a related \Thelia\Model\CartItem object
+     *
+     * @param \Thelia\Model\CartItem|ObjectCollection $cartItem  the related object to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildStockQuery The current query, for fluid interface
+     */
+    public function filterByCartItem($cartItem, $comparison = null)
+    {
+        if ($cartItem instanceof \Thelia\Model\CartItem) {
+            return $this
+                ->addUsingAlias(StockTableMap::ID, $cartItem->getStockId(), $comparison);
+        } elseif ($cartItem instanceof ObjectCollection) {
+            return $this
+                ->useCartItemQuery()
+                ->filterByPrimaryKeys($cartItem->getPrimaryKeys())
+                ->endUse();
+        } else {
+            throw new PropelException('filterByCartItem() only accepts arguments of type \Thelia\Model\CartItem or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the CartItem relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return ChildStockQuery The current query, for fluid interface
+     */
+    public function joinCartItem($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('CartItem');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'CartItem');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the CartItem relation CartItem object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return   \Thelia\Model\CartItemQuery A secondary query class using the current class as primary query
+     */
+    public function useCartItemQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        return $this
+            ->joinCartItem($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'CartItem', '\Thelia\Model\CartItemQuery');
+    }
+
+    /**
+     * Filter the query by a related \Thelia\Model\ProductPrice object
+     *
+     * @param \Thelia\Model\ProductPrice|ObjectCollection $productPrice  the related object to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildStockQuery The current query, for fluid interface
+     */
+    public function filterByProductPrice($productPrice, $comparison = null)
+    {
+        if ($productPrice instanceof \Thelia\Model\ProductPrice) {
+            return $this
+                ->addUsingAlias(StockTableMap::ID, $productPrice->getStockId(), $comparison);
+        } elseif ($productPrice instanceof ObjectCollection) {
+            return $this
+                ->useProductPriceQuery()
+                ->filterByPrimaryKeys($productPrice->getPrimaryKeys())
+                ->endUse();
+        } else {
+            throw new PropelException('filterByProductPrice() only accepts arguments of type \Thelia\Model\ProductPrice or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the ProductPrice relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return ChildStockQuery The current query, for fluid interface
+     */
+    public function joinProductPrice($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('ProductPrice');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'ProductPrice');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the ProductPrice relation ProductPrice object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return   \Thelia\Model\ProductPriceQuery A secondary query class using the current class as primary query
+     */
+    public function useProductPriceQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        return $this
+            ->joinProductPrice($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'ProductPrice', '\Thelia\Model\ProductPriceQuery');
+    }
+
     /**
      * Exclude object from result
      *

core/lib/Thelia/Model/FeatureProd.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-use Thelia\Model\Base\FeatureProd as BaseFeatureProd;
-
-class FeatureProd extends BaseFeatureProd {
-
-}

core/lib/Thelia/Model/FeatureProduct.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Thelia\Model;
+
+use Thelia\Model\Base\FeatureProduct as BaseFeatureProduct;
+
+        class FeatureProduct extends BaseFeatureProduct
+{
+
+}

core/lib/Thelia/Model/FeatureProductQuery.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Thelia\Model;
+
+use Thelia\Model\Base\FeatureProductQuery as BaseFeatureProductQuery;
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'feature_product' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class FeatureProductQuery extends BaseFeatureProductQuery
+{
+
+} // FeatureProductQuery

core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php

@@ -57,7 +57,7 @@ class AttributeCombinationTableMap extends TableMap
     /**
      * The total number of columns
      */
-    const NUM_COLUMNS = 6;
+    const NUM_COLUMNS = 5;
 
     /**
      * The number of lazy-loaded columns
@@ -67,28 +67,23 @@ class AttributeCombinationTableMap extends TableMap
     /**
      * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
      */
-    const NUM_HYDRATE_COLUMNS = 6;
+    const NUM_HYDRATE_COLUMNS = 5;
-
-    /**
-     * the column name for the ID field
-     */
-    const ID = 'attribute_combination.ID';
 
     /**
      * the column name for the ATTRIBUTE_ID field
      */
     const ATTRIBUTE_ID = 'attribute_combination.ATTRIBUTE_ID';
 
-    /**
-     * the column name for the COMBINATION_ID field
-     */
-    const COMBINATION_ID = 'attribute_combination.COMBINATION_ID';
-
     /**
      * the column name for the ATTRIBUTE_AV_ID field
      */
     const ATTRIBUTE_AV_ID = 'attribute_combination.ATTRIBUTE_AV_ID';
 
+    /**
+     * the column name for the STOCK_ID field
+     */
+    const STOCK_ID = 'attribute_combination.STOCK_ID';
+
     /**
      * the column name for the CREATED_AT field
      */
@@ -111,12 +106,12 @@ class AttributeCombinationTableMap extends TableMap
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'AttributeId', 'CombinationId', 'AttributeAvId', 'CreatedAt', 'UpdatedAt', ),
+        self::TYPE_PHPNAME       => array('AttributeId', 'AttributeAvId', 'StockId', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'attributeId', 'combinationId', 'attributeAvId', 'createdAt', 'updatedAt', ),
+        self::TYPE_STUDLYPHPNAME => array('attributeId', 'attributeAvId', 'stockId', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(AttributeCombinationTableMap::ID, AttributeCombinationTableMap::ATTRIBUTE_ID, AttributeCombinationTableMap::COMBINATION_ID, AttributeCombinationTableMap::ATTRIBUTE_AV_ID, AttributeCombinationTableMap::CREATED_AT, AttributeCombinationTableMap::UPDATED_AT, ),
+        self::TYPE_COLNAME       => array(AttributeCombinationTableMap::ATTRIBUTE_ID, AttributeCombinationTableMap::ATTRIBUTE_AV_ID, AttributeCombinationTableMap::STOCK_ID, AttributeCombinationTableMap::CREATED_AT, AttributeCombinationTableMap::UPDATED_AT, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'ATTRIBUTE_ID', 'COMBINATION_ID', 'ATTRIBUTE_AV_ID', 'CREATED_AT', 'UPDATED_AT', ),
+        self::TYPE_RAW_COLNAME   => array('ATTRIBUTE_ID', 'ATTRIBUTE_AV_ID', 'STOCK_ID', 'CREATED_AT', 'UPDATED_AT', ),
-        self::TYPE_FIELDNAME     => array('id', 'attribute_id', 'combination_id', 'attribute_av_id', 'created_at', 'updated_at', ),
+        self::TYPE_FIELDNAME     => array('attribute_id', 'attribute_av_id', 'stock_id', 'created_at', 'updated_at', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, )
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, )
     );
 
     /**
@@ -126,12 +121,12 @@ class AttributeCombinationTableMap extends TableMap
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
     protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'AttributeId' => 1, 'CombinationId' => 2, 'AttributeAvId' => 3, 'CreatedAt' => 4, 'UpdatedAt' => 5, ),
+        self::TYPE_PHPNAME       => array('AttributeId' => 0, 'AttributeAvId' => 1, 'StockId' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'attributeId' => 1, 'combinationId' => 2, 'attributeAvId' => 3, 'createdAt' => 4, 'updatedAt' => 5, ),
+        self::TYPE_STUDLYPHPNAME => array('attributeId' => 0, 'attributeAvId' => 1, 'stockId' => 2, 'createdAt' => 3, 'updatedAt' => 4, ),
-        self::TYPE_COLNAME       => array(AttributeCombinationTableMap::ID => 0, AttributeCombinationTableMap::ATTRIBUTE_ID => 1, AttributeCombinationTableMap::COMBINATION_ID => 2, AttributeCombinationTableMap::ATTRIBUTE_AV_ID => 3, AttributeCombinationTableMap::CREATED_AT => 4, AttributeCombinationTableMap::UPDATED_AT => 5, ),
+        self::TYPE_COLNAME       => array(AttributeCombinationTableMap::ATTRIBUTE_ID => 0, AttributeCombinationTableMap::ATTRIBUTE_AV_ID => 1, AttributeCombinationTableMap::STOCK_ID => 2, AttributeCombinationTableMap::CREATED_AT => 3, AttributeCombinationTableMap::UPDATED_AT => 4, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'ATTRIBUTE_ID' => 1, 'COMBINATION_ID' => 2, 'ATTRIBUTE_AV_ID' => 3, 'CREATED_AT' => 4, 'UPDATED_AT' => 5, ),
+        self::TYPE_RAW_COLNAME   => array('ATTRIBUTE_ID' => 0, 'ATTRIBUTE_AV_ID' => 1, 'STOCK_ID' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'attribute_id' => 1, 'combination_id' => 2, 'attribute_av_id' => 3, 'created_at' => 4, 'updated_at' => 5, ),
+        self::TYPE_FIELDNAME     => array('attribute_id' => 0, 'attribute_av_id' => 1, 'stock_id' => 2, 'created_at' => 3, 'updated_at' => 4, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, )
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, )
     );
 
     /**
@@ -148,12 +143,11 @@ class AttributeCombinationTableMap extends TableMap
         $this->setPhpName('AttributeCombination');
         $this->setClassName('\\Thelia\\Model\\AttributeCombination');
         $this->setPackage('Thelia.Model');
-        $this->setUseIdGenerator(true);
+        $this->setUseIdGenerator(false);
         // columns
-        $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
         $this->addForeignPrimaryKey('ATTRIBUTE_ID', 'AttributeId', 'INTEGER' , 'attribute', 'ID', true, null, null);
-        $this->addForeignPrimaryKey('COMBINATION_ID', 'CombinationId', 'INTEGER' , 'combination', 'ID', true, null, null);
         $this->addForeignPrimaryKey('ATTRIBUTE_AV_ID', 'AttributeAvId', 'INTEGER' , 'attribute_av', 'ID', true, null, null);
+        $this->addForeignPrimaryKey('STOCK_ID', 'StockId', 'INTEGER' , 'stock', 'ID', true, null, null);
         $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
         $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
     } // initialize()
@@ -165,7 +159,7 @@ class AttributeCombinationTableMap extends TableMap
     {
         $this->addRelation('Attribute', '\\Thelia\\Model\\Attribute', RelationMap::MANY_TO_ONE, array('attribute_id' => 'id', ), 'CASCADE', 'RESTRICT');
         $this->addRelation('AttributeAv', '\\Thelia\\Model\\AttributeAv', RelationMap::MANY_TO_ONE, array('attribute_av_id' => 'id', ), 'CASCADE', 'RESTRICT');
-        $this->addRelation('Combination', '\\Thelia\\Model\\Combination', RelationMap::MANY_TO_ONE, array('combination_id' => 'id', ), 'CASCADE', 'RESTRICT');
+        $this->addRelation('Stock', '\\Thelia\\Model\\Stock', RelationMap::MANY_TO_ONE, array('stock_id' => 'id', ), null, null);
     } // buildRelations()
 
     /**
@@ -196,7 +190,7 @@ class AttributeCombinationTableMap extends TableMap
     {
         if (Propel::isInstancePoolingEnabled()) {
             if (null === $key) {
-                $key = serialize(array((string) $obj->getId(), (string) $obj->getAttributeId(), (string) $obj->getCombinationId(), (string) $obj->getAttributeAvId()));
+                $key = serialize(array((string) $obj->getAttributeId(), (string) $obj->getAttributeAvId(), (string) $obj->getStockId()));
             } // if key === null
             self::$instances[$key] = $obj;
         }
@@ -216,11 +210,11 @@ class AttributeCombinationTableMap extends TableMap
     {
         if (Propel::isInstancePoolingEnabled() && null !== $value) {
             if (is_object($value) && $value instanceof \Thelia\Model\AttributeCombination) {
-                $key = serialize(array((string) $value->getId(), (string) $value->getAttributeId(), (string) $value->getCombinationId(), (string) $value->getAttributeAvId()));
+                $key = serialize(array((string) $value->getAttributeId(), (string) $value->getAttributeAvId(), (string) $value->getStockId()));
 
-            } elseif (is_array($value) && count($value) === 4) {
+            } elseif (is_array($value) && count($value) === 3) {
                 // assume we've been passed a primary key";
-                $key = serialize(array((string) $value[0], (string) $value[1], (string) $value[2], (string) $value[3]));
+                $key = serialize(array((string) $value[0], (string) $value[1], (string) $value[2]));
             } elseif ($value instanceof Criteria) {
                 self::$instances = [];
 
@@ -248,11 +242,11 @@ class AttributeCombinationTableMap extends TableMap
     public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
     {
         // If the PK cannot be derived from the row, return NULL.
-        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('AttributeId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('CombinationId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 3 + $offset : static::translateFieldName('AttributeAvId', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('AttributeId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('AttributeAvId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('StockId', TableMap::TYPE_PHPNAME, $indexType)] === null) {
             return null;
         }
 
-        return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('AttributeId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('CombinationId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 3 + $offset : static::translateFieldName('AttributeAvId', TableMap::TYPE_PHPNAME, $indexType)]));
+        return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('AttributeId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('AttributeAvId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('StockId', TableMap::TYPE_PHPNAME, $indexType)]));
     }
 
     /**
@@ -368,17 +362,15 @@ class AttributeCombinationTableMap extends TableMap
     public static function addSelectColumns(Criteria $criteria, $alias = null)
     {
         if (null === $alias) {
-            $criteria->addSelectColumn(AttributeCombinationTableMap::ID);
             $criteria->addSelectColumn(AttributeCombinationTableMap::ATTRIBUTE_ID);
-            $criteria->addSelectColumn(AttributeCombinationTableMap::COMBINATION_ID);
             $criteria->addSelectColumn(AttributeCombinationTableMap::ATTRIBUTE_AV_ID);
+            $criteria->addSelectColumn(AttributeCombinationTableMap::STOCK_ID);
             $criteria->addSelectColumn(AttributeCombinationTableMap::CREATED_AT);
             $criteria->addSelectColumn(AttributeCombinationTableMap::UPDATED_AT);
         } else {
-            $criteria->addSelectColumn($alias . '.ID');
             $criteria->addSelectColumn($alias . '.ATTRIBUTE_ID');
-            $criteria->addSelectColumn($alias . '.COMBINATION_ID');
             $criteria->addSelectColumn($alias . '.ATTRIBUTE_AV_ID');
+            $criteria->addSelectColumn($alias . '.STOCK_ID');
             $criteria->addSelectColumn($alias . '.CREATED_AT');
             $criteria->addSelectColumn($alias . '.UPDATED_AT');
         }
@@ -439,10 +431,9 @@ class AttributeCombinationTableMap extends TableMap
                 $values = array($values);
             }
             foreach ($values as $value) {
-                $criterion = $criteria->getNewCriterion(AttributeCombinationTableMap::ID, $value[0]);
+                $criterion = $criteria->getNewCriterion(AttributeCombinationTableMap::ATTRIBUTE_ID, $value[0]);
-                $criterion->addAnd($criteria->getNewCriterion(AttributeCombinationTableMap::ATTRIBUTE_ID, $value[1]));
+                $criterion->addAnd($criteria->getNewCriterion(AttributeCombinationTableMap::ATTRIBUTE_AV_ID, $value[1]));
-                $criterion->addAnd($criteria->getNewCriterion(AttributeCombinationTableMap::COMBINATION_ID, $value[2]));
+                $criterion->addAnd($criteria->getNewCriterion(AttributeCombinationTableMap::STOCK_ID, $value[2]));
-                $criterion->addAnd($criteria->getNewCriterion(AttributeCombinationTableMap::ATTRIBUTE_AV_ID, $value[3]));
                 $criteria->addOr($criterion);
             }
         }
@@ -490,10 +481,6 @@ class AttributeCombinationTableMap extends TableMap
             $criteria = $criteria->buildCriteria(); // build Criteria from AttributeCombination object
         }
 
-        if ($criteria->containsKey(AttributeCombinationTableMap::ID) && $criteria->keyContainsValue(AttributeCombinationTableMap::ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.AttributeCombinationTableMap::ID.')');
-        }
-
 
         // Set the correct dbName
         $query = AttributeCombinationQuery::create()->mergeWith($criteria);

core/lib/Thelia/Model/Map/CartItemTableMap.php

@@ -90,9 +90,9 @@ class CartItemTableMap extends TableMap
     const QUANTITY = 'cart_item.QUANTITY';
 
     /**
-     * the column name for the COMBINATION_ID field
+     * the column name for the STOCK_ID field
      */
-    const COMBINATION_ID = 'cart_item.COMBINATION_ID';
+    const STOCK_ID = 'cart_item.STOCK_ID';
 
     /**
      * the column name for the CREATED_AT field
@@ -116,11 +116,11 @@ class CartItemTableMap extends TableMap
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'CartId', 'ProductId', 'Quantity', 'CombinationId', 'CreatedAt', 'UpdatedAt', ),
+        self::TYPE_PHPNAME       => array('Id', 'CartId', 'ProductId', 'Quantity', 'StockId', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'cartId', 'productId', 'quantity', 'combinationId', 'createdAt', 'updatedAt', ),
+        self::TYPE_STUDLYPHPNAME => array('id', 'cartId', 'productId', 'quantity', 'stockId', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(CartItemTableMap::ID, CartItemTableMap::CART_ID, CartItemTableMap::PRODUCT_ID, CartItemTableMap::QUANTITY, CartItemTableMap::COMBINATION_ID, CartItemTableMap::CREATED_AT, CartItemTableMap::UPDATED_AT, ),
+        self::TYPE_COLNAME       => array(CartItemTableMap::ID, CartItemTableMap::CART_ID, CartItemTableMap::PRODUCT_ID, CartItemTableMap::QUANTITY, CartItemTableMap::STOCK_ID, CartItemTableMap::CREATED_AT, CartItemTableMap::UPDATED_AT, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'CART_ID', 'PRODUCT_ID', 'QUANTITY', 'COMBINATION_ID', 'CREATED_AT', 'UPDATED_AT', ),
+        self::TYPE_RAW_COLNAME   => array('ID', 'CART_ID', 'PRODUCT_ID', 'QUANTITY', 'STOCK_ID', 'CREATED_AT', 'UPDATED_AT', ),
-        self::TYPE_FIELDNAME     => array('id', 'cart_id', 'product_id', 'quantity', 'combination_id', 'created_at', 'updated_at', ),
+        self::TYPE_FIELDNAME     => array('id', 'cart_id', 'product_id', 'quantity', 'stock_id', 'created_at', 'updated_at', ),
         self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
     );
 
@@ -131,11 +131,11 @@ class CartItemTableMap extends TableMap
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
     protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'CartId' => 1, 'ProductId' => 2, 'Quantity' => 3, 'CombinationId' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ),
+        self::TYPE_PHPNAME       => array('Id' => 0, 'CartId' => 1, 'ProductId' => 2, 'Quantity' => 3, 'StockId' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'cartId' => 1, 'productId' => 2, 'quantity' => 3, 'combinationId' => 4, 'createdAt' => 5, 'updatedAt' => 6, ),
+        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'cartId' => 1, 'productId' => 2, 'quantity' => 3, 'stockId' => 4, 'createdAt' => 5, 'updatedAt' => 6, ),
-        self::TYPE_COLNAME       => array(CartItemTableMap::ID => 0, CartItemTableMap::CART_ID => 1, CartItemTableMap::PRODUCT_ID => 2, CartItemTableMap::QUANTITY => 3, CartItemTableMap::COMBINATION_ID => 4, CartItemTableMap::CREATED_AT => 5, CartItemTableMap::UPDATED_AT => 6, ),
+        self::TYPE_COLNAME       => array(CartItemTableMap::ID => 0, CartItemTableMap::CART_ID => 1, CartItemTableMap::PRODUCT_ID => 2, CartItemTableMap::QUANTITY => 3, CartItemTableMap::STOCK_ID => 4, CartItemTableMap::CREATED_AT => 5, CartItemTableMap::UPDATED_AT => 6, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'CART_ID' => 1, 'PRODUCT_ID' => 2, 'QUANTITY' => 3, 'COMBINATION_ID' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ),
+        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'CART_ID' => 1, 'PRODUCT_ID' => 2, 'QUANTITY' => 3, 'STOCK_ID' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'cart_id' => 1, 'product_id' => 2, 'quantity' => 3, 'combination_id' => 4, 'created_at' => 5, 'updated_at' => 6, ),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'cart_id' => 1, 'product_id' => 2, 'quantity' => 3, 'stock_id' => 4, 'created_at' => 5, 'updated_at' => 6, ),
         self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
     );
 
@@ -159,7 +159,7 @@ class CartItemTableMap extends TableMap
         $this->addForeignKey('CART_ID', 'CartId', 'INTEGER', 'cart', 'ID', true, null, null);
         $this->addForeignKey('PRODUCT_ID', 'ProductId', 'INTEGER', 'product', 'ID', true, null, null);
         $this->addColumn('QUANTITY', 'Quantity', 'FLOAT', false, null, 1);
-        $this->addForeignKey('COMBINATION_ID', 'CombinationId', 'INTEGER', 'combination', 'ID', false, null, null);
+        $this->addForeignKey('STOCK_ID', 'StockId', 'INTEGER', 'stock', 'ID', true, null, null);
         $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
         $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
     } // initialize()
@@ -171,7 +171,7 @@ class CartItemTableMap extends TableMap
     {
         $this->addRelation('Cart', '\\Thelia\\Model\\Cart', RelationMap::MANY_TO_ONE, array('cart_id' => 'id', ), null, null);
         $this->addRelation('Product', '\\Thelia\\Model\\Product', RelationMap::MANY_TO_ONE, array('product_id' => 'id', ), null, null);
-        $this->addRelation('Combination', '\\Thelia\\Model\\Combination', RelationMap::MANY_TO_ONE, array('combination_id' => 'id', ), null, null);
+        $this->addRelation('Stock', '\\Thelia\\Model\\Stock', RelationMap::MANY_TO_ONE, array('stock_id' => 'id', ), null, null);
     } // buildRelations()
 
     /**
@@ -329,7 +329,7 @@ class CartItemTableMap extends TableMap
             $criteria->addSelectColumn(CartItemTableMap::CART_ID);
             $criteria->addSelectColumn(CartItemTableMap::PRODUCT_ID);
             $criteria->addSelectColumn(CartItemTableMap::QUANTITY);
-            $criteria->addSelectColumn(CartItemTableMap::COMBINATION_ID);
+            $criteria->addSelectColumn(CartItemTableMap::STOCK_ID);
             $criteria->addSelectColumn(CartItemTableMap::CREATED_AT);
             $criteria->addSelectColumn(CartItemTableMap::UPDATED_AT);
         } else {
@@ -337,7 +337,7 @@ class CartItemTableMap extends TableMap
             $criteria->addSelectColumn($alias . '.CART_ID');
             $criteria->addSelectColumn($alias . '.PRODUCT_ID');
             $criteria->addSelectColumn($alias . '.QUANTITY');
-            $criteria->addSelectColumn($alias . '.COMBINATION_ID');
+            $criteria->addSelectColumn($alias . '.STOCK_ID');
             $criteria->addSelectColumn($alias . '.CREATED_AT');
             $criteria->addSelectColumn($alias . '.UPDATED_AT');
         }

core/lib/Thelia/Model/Map/CategoryTableMap.php

@@ -213,9 +213,9 @@ class CategoryTableMap extends TableMap
     public function getBehaviors()
     {
         return array(
-            'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
             'i18n' => array('i18n_table' => '%TABLE%_i18n', 'i18n_phpname' => '%PHPNAME%I18n', 'i18n_columns' => 'title, description, chapo, postscriptum', 'locale_column' => 'locale', 'locale_length' => '5', 'default_locale' => '', 'locale_alias' => '', ),
             'versionable' => array('version_column' => 'version', 'version_table' => '', 'log_created_at' => 'true', 'log_created_by' => 'true', 'log_comment' => 'false', 'version_created_at_column' => 'version_created_at', 'version_created_by_column' => 'version_created_by', 'version_comment_column' => 'version_comment', ),
+            'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
         );
     } // getBehaviors()
     /**

core/lib/Thelia/Model/Map/CurrencyTableMap.php

@@ -177,6 +177,7 @@ class CurrencyTableMap extends TableMap
     {
         $this->addRelation('Order', '\\Thelia\\Model\\Order', RelationMap::ONE_TO_MANY, array('id' => 'currency_id', ), 'SET NULL', 'RESTRICT', 'Orders');
         $this->addRelation('Cart', '\\Thelia\\Model\\Cart', RelationMap::ONE_TO_MANY, array('id' => 'currency_id', ), null, null, 'Carts');
+        $this->addRelation('ProductPrice', '\\Thelia\\Model\\ProductPrice', RelationMap::ONE_TO_MANY, array('id' => 'currency_id', ), null, null, 'ProductPrices');
     } // buildRelations()
 
     /**

core/lib/Thelia/Model/Map/FeatureAvTableMap.php

@@ -57,7 +57,7 @@ class FeatureAvTableMap extends TableMap
     /**
      * The total number of columns
      */
-    const NUM_COLUMNS = 4;
+    const NUM_COLUMNS = 5;
 
     /**
      * The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class FeatureAvTableMap extends TableMap
     /**
      * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
      */
-    const NUM_HYDRATE_COLUMNS = 4;
+    const NUM_HYDRATE_COLUMNS = 5;
 
     /**
      * the column name for the ID field
@@ -79,6 +79,11 @@ class FeatureAvTableMap extends TableMap
      */
     const FEATURE_ID = 'feature_av.FEATURE_ID';
 
+    /**
+     * the column name for the POSITION field
+     */
+    const POSITION = 'feature_av.POSITION';
+
     /**
      * the column name for the CREATED_AT field
      */
@@ -110,12 +115,12 @@ class FeatureAvTableMap extends TableMap
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'FeatureId', 'CreatedAt', 'UpdatedAt', ),
+        self::TYPE_PHPNAME       => array('Id', 'FeatureId', 'Position', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'featureId', 'createdAt', 'updatedAt', ),
+        self::TYPE_STUDLYPHPNAME => array('id', 'featureId', 'position', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(FeatureAvTableMap::ID, FeatureAvTableMap::FEATURE_ID, FeatureAvTableMap::CREATED_AT, FeatureAvTableMap::UPDATED_AT, ),
+        self::TYPE_COLNAME       => array(FeatureAvTableMap::ID, FeatureAvTableMap::FEATURE_ID, FeatureAvTableMap::POSITION, FeatureAvTableMap::CREATED_AT, FeatureAvTableMap::UPDATED_AT, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'FEATURE_ID', 'CREATED_AT', 'UPDATED_AT', ),
+        self::TYPE_RAW_COLNAME   => array('ID', 'FEATURE_ID', 'POSITION', 'CREATED_AT', 'UPDATED_AT', ),
-        self::TYPE_FIELDNAME     => array('id', 'feature_id', 'created_at', 'updated_at', ),
+        self::TYPE_FIELDNAME     => array('id', 'feature_id', 'position', 'created_at', 'updated_at', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, )
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, )
     );
 
     /**
@@ -125,12 +130,12 @@ class FeatureAvTableMap extends TableMap
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
     protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'FeatureId' => 1, 'CreatedAt' => 2, 'UpdatedAt' => 3, ),
+        self::TYPE_PHPNAME       => array('Id' => 0, 'FeatureId' => 1, 'Position' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'featureId' => 1, 'createdAt' => 2, 'updatedAt' => 3, ),
+        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'featureId' => 1, 'position' => 2, 'createdAt' => 3, 'updatedAt' => 4, ),
-        self::TYPE_COLNAME       => array(FeatureAvTableMap::ID => 0, FeatureAvTableMap::FEATURE_ID => 1, FeatureAvTableMap::CREATED_AT => 2, FeatureAvTableMap::UPDATED_AT => 3, ),
+        self::TYPE_COLNAME       => array(FeatureAvTableMap::ID => 0, FeatureAvTableMap::FEATURE_ID => 1, FeatureAvTableMap::POSITION => 2, FeatureAvTableMap::CREATED_AT => 3, FeatureAvTableMap::UPDATED_AT => 4, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'FEATURE_ID' => 1, 'CREATED_AT' => 2, 'UPDATED_AT' => 3, ),
+        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'FEATURE_ID' => 1, 'POSITION' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'feature_id' => 1, 'created_at' => 2, 'updated_at' => 3, ),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'feature_id' => 1, 'position' => 2, 'created_at' => 3, 'updated_at' => 4, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, )
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, )
     );
 
     /**
@@ -151,6 +156,7 @@ class FeatureAvTableMap extends TableMap
         // columns
         $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
         $this->addForeignKey('FEATURE_ID', 'FeatureId', 'INTEGER', 'feature', 'ID', true, null, null);
+        $this->addColumn('POSITION', 'Position', 'INTEGER', true, null, null);
         $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
         $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
     } // initialize()
@@ -161,7 +167,7 @@ class FeatureAvTableMap extends TableMap
     public function buildRelations()
     {
         $this->addRelation('Feature', '\\Thelia\\Model\\Feature', RelationMap::MANY_TO_ONE, array('feature_id' => 'id', ), 'CASCADE', 'RESTRICT');
-        $this->addRelation('FeatureProd', '\\Thelia\\Model\\FeatureProd', RelationMap::ONE_TO_MANY, array('id' => 'feature_av_id', ), 'CASCADE', 'RESTRICT', 'FeatureProds');
+        $this->addRelation('FeatureProduct', '\\Thelia\\Model\\FeatureProduct', RelationMap::ONE_TO_MANY, array('id' => 'feature_av_id', ), 'CASCADE', 'RESTRICT', 'FeatureProducts');
         $this->addRelation('FeatureAvI18n', '\\Thelia\\Model\\FeatureAvI18n', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'FeatureAvI18ns');
     } // buildRelations()
 
@@ -185,7 +191,7 @@ class FeatureAvTableMap extends TableMap
     {
         // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool,
         // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule.
-                FeatureProdTableMap::clearInstancePool();
+                FeatureProductTableMap::clearInstancePool();
                 FeatureAvI18nTableMap::clearInstancePool();
             }
 
@@ -329,11 +335,13 @@ class FeatureAvTableMap extends TableMap
         if (null === $alias) {
             $criteria->addSelectColumn(FeatureAvTableMap::ID);
             $criteria->addSelectColumn(FeatureAvTableMap::FEATURE_ID);
+            $criteria->addSelectColumn(FeatureAvTableMap::POSITION);
             $criteria->addSelectColumn(FeatureAvTableMap::CREATED_AT);
             $criteria->addSelectColumn(FeatureAvTableMap::UPDATED_AT);
         } else {
             $criteria->addSelectColumn($alias . '.ID');
             $criteria->addSelectColumn($alias . '.FEATURE_ID');
+            $criteria->addSelectColumn($alias . '.POSITION');
             $criteria->addSelectColumn($alias . '.CREATED_AT');
             $criteria->addSelectColumn($alias . '.UPDATED_AT');
         }

core/lib/Thelia/Model/Map/FeatureProductTableMap.php

@@ -10,12 +10,12 @@ use Propel\Runtime\Exception\PropelException;
 use Propel\Runtime\Map\RelationMap;
 use Propel\Runtime\Map\TableMap;
 use Propel\Runtime\Map\TableMapTrait;
-use Thelia\Model\FeatureProd;
+use Thelia\Model\FeatureProduct;
-use Thelia\Model\FeatureProdQuery;
+use Thelia\Model\FeatureProductQuery;
 
 
 /**
- * This class defines the structure of the 'feature_prod' table.
+ * This class defines the structure of the 'feature_product' table.
  *
  *
  *
@@ -25,14 +25,14 @@ use Thelia\Model\FeatureProdQuery;
  * (i.e. if it's a text column type).
  *
  */
-class FeatureProdTableMap extends TableMap
+class FeatureProductTableMap extends TableMap
 {
     use InstancePoolTrait;
     use TableMapTrait;
     /**
      * The (dot-path) name of this class
      */
-    const CLASS_NAME = 'Thelia.Model.Map.FeatureProdTableMap';
+    const CLASS_NAME = 'Thelia.Model.Map.FeatureProductTableMap';
 
     /**
      * The default database name for this class
@@ -42,17 +42,17 @@ class FeatureProdTableMap extends TableMap
     /**
      * The table name for this class
      */
-    const TABLE_NAME = 'feature_prod';
+    const TABLE_NAME = 'feature_product';
 
     /**
      * The related Propel class for this table
      */
-    const OM_CLASS = '\\Thelia\\Model\\FeatureProd';
+    const OM_CLASS = '\\Thelia\\Model\\FeatureProduct';
 
     /**
      * A class that can be returned by this tableMap
      */
-    const CLASS_DEFAULT = 'Thelia.Model.FeatureProd';
+    const CLASS_DEFAULT = 'Thelia.Model.FeatureProduct';
 
     /**
      * The total number of columns
@@ -72,42 +72,42 @@ class FeatureProdTableMap extends TableMap
     /**
      * the column name for the ID field
      */
-    const ID = 'feature_prod.ID';
+    const ID = 'feature_product.ID';
 
     /**
      * the column name for the PRODUCT_ID field
      */
-    const PRODUCT_ID = 'feature_prod.PRODUCT_ID';
+    const PRODUCT_ID = 'feature_product.PRODUCT_ID';
 
     /**
      * the column name for the FEATURE_ID field
      */
-    const FEATURE_ID = 'feature_prod.FEATURE_ID';
+    const FEATURE_ID = 'feature_product.FEATURE_ID';
 
     /**
      * the column name for the FEATURE_AV_ID field
      */
-    const FEATURE_AV_ID = 'feature_prod.FEATURE_AV_ID';
+    const FEATURE_AV_ID = 'feature_product.FEATURE_AV_ID';
 
     /**
      * the column name for the BY_DEFAULT field
      */
-    const BY_DEFAULT = 'feature_prod.BY_DEFAULT';
+    const BY_DEFAULT = 'feature_product.BY_DEFAULT';
 
     /**
      * the column name for the POSITION field
      */
-    const POSITION = 'feature_prod.POSITION';
+    const POSITION = 'feature_product.POSITION';
 
     /**
      * the column name for the CREATED_AT field
      */
-    const CREATED_AT = 'feature_prod.CREATED_AT';
+    const CREATED_AT = 'feature_product.CREATED_AT';
 
     /**
      * the column name for the UPDATED_AT field
      */
-    const UPDATED_AT = 'feature_prod.UPDATED_AT';
+    const UPDATED_AT = 'feature_product.UPDATED_AT';
 
     /**
      * The default string format for model objects of the related table
@@ -123,7 +123,7 @@ class FeatureProdTableMap extends TableMap
     protected static $fieldNames = array (
         self::TYPE_PHPNAME       => array('Id', 'ProductId', 'FeatureId', 'FeatureAvId', 'ByDefault', 'Position', 'CreatedAt', 'UpdatedAt', ),
         self::TYPE_STUDLYPHPNAME => array('id', 'productId', 'featureId', 'featureAvId', 'byDefault', 'position', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(FeatureProdTableMap::ID, FeatureProdTableMap::PRODUCT_ID, FeatureProdTableMap::FEATURE_ID, FeatureProdTableMap::FEATURE_AV_ID, FeatureProdTableMap::BY_DEFAULT, FeatureProdTableMap::POSITION, FeatureProdTableMap::CREATED_AT, FeatureProdTableMap::UPDATED_AT, ),
+        self::TYPE_COLNAME       => array(FeatureProductTableMap::ID, FeatureProductTableMap::PRODUCT_ID, FeatureProductTableMap::FEATURE_ID, FeatureProductTableMap::FEATURE_AV_ID, FeatureProductTableMap::BY_DEFAULT, FeatureProductTableMap::POSITION, FeatureProductTableMap::CREATED_AT, FeatureProductTableMap::UPDATED_AT, ),
         self::TYPE_RAW_COLNAME   => array('ID', 'PRODUCT_ID', 'FEATURE_ID', 'FEATURE_AV_ID', 'BY_DEFAULT', 'POSITION', 'CREATED_AT', 'UPDATED_AT', ),
         self::TYPE_FIELDNAME     => array('id', 'product_id', 'feature_id', 'feature_av_id', 'by_default', 'position', 'created_at', 'updated_at', ),
         self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, )
@@ -138,7 +138,7 @@ class FeatureProdTableMap extends TableMap
     protected static $fieldKeys = array (
         self::TYPE_PHPNAME       => array('Id' => 0, 'ProductId' => 1, 'FeatureId' => 2, 'FeatureAvId' => 3, 'ByDefault' => 4, 'Position' => 5, 'CreatedAt' => 6, 'UpdatedAt' => 7, ),
         self::TYPE_STUDLYPHPNAME => array('id' => 0, 'productId' => 1, 'featureId' => 2, 'featureAvId' => 3, 'byDefault' => 4, 'position' => 5, 'createdAt' => 6, 'updatedAt' => 7, ),
-        self::TYPE_COLNAME       => array(FeatureProdTableMap::ID => 0, FeatureProdTableMap::PRODUCT_ID => 1, FeatureProdTableMap::FEATURE_ID => 2, FeatureProdTableMap::FEATURE_AV_ID => 3, FeatureProdTableMap::BY_DEFAULT => 4, FeatureProdTableMap::POSITION => 5, FeatureProdTableMap::CREATED_AT => 6, FeatureProdTableMap::UPDATED_AT => 7, ),
+        self::TYPE_COLNAME       => array(FeatureProductTableMap::ID => 0, FeatureProductTableMap::PRODUCT_ID => 1, FeatureProductTableMap::FEATURE_ID => 2, FeatureProductTableMap::FEATURE_AV_ID => 3, FeatureProductTableMap::BY_DEFAULT => 4, FeatureProductTableMap::POSITION => 5, FeatureProductTableMap::CREATED_AT => 6, FeatureProductTableMap::UPDATED_AT => 7, ),
         self::TYPE_RAW_COLNAME   => array('ID' => 0, 'PRODUCT_ID' => 1, 'FEATURE_ID' => 2, 'FEATURE_AV_ID' => 3, 'BY_DEFAULT' => 4, 'POSITION' => 5, 'CREATED_AT' => 6, 'UPDATED_AT' => 7, ),
         self::TYPE_FIELDNAME     => array('id' => 0, 'product_id' => 1, 'feature_id' => 2, 'feature_av_id' => 3, 'by_default' => 4, 'position' => 5, 'created_at' => 6, 'updated_at' => 7, ),
         self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, )
@@ -154,9 +154,9 @@ class FeatureProdTableMap extends TableMap
     public function initialize()
     {
         // attributes
-        $this->setName('feature_prod');
+        $this->setName('feature_product');
-        $this->setPhpName('FeatureProd');
+        $this->setPhpName('FeatureProduct');
-        $this->setClassName('\\Thelia\\Model\\FeatureProd');
+        $this->setClassName('\\Thelia\\Model\\FeatureProduct');
         $this->setPackage('Thelia.Model');
         $this->setUseIdGenerator(true);
         // columns
@@ -249,7 +249,7 @@ class FeatureProdTableMap extends TableMap
      */
     public static function getOMClass($withPrefix = true)
     {
-        return $withPrefix ? FeatureProdTableMap::CLASS_DEFAULT : FeatureProdTableMap::OM_CLASS;
+        return $withPrefix ? FeatureProductTableMap::CLASS_DEFAULT : FeatureProductTableMap::OM_CLASS;
     }
 
     /**
@@ -263,21 +263,21 @@ class FeatureProdTableMap extends TableMap
      *
      * @throws PropelException Any exceptions caught during processing will be
      *         rethrown wrapped into a PropelException.
-     * @return array (FeatureProd object, last column rank)
+     * @return array (FeatureProduct object, last column rank)
      */
     public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
     {
-        $key = FeatureProdTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
+        $key = FeatureProductTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
-        if (null !== ($obj = FeatureProdTableMap::getInstanceFromPool($key))) {
+        if (null !== ($obj = FeatureProductTableMap::getInstanceFromPool($key))) {
             // We no longer rehydrate the object, since this can cause data loss.
             // See http://www.propelorm.org/ticket/509
             // $obj->hydrate($row, $offset, true); // rehydrate
-            $col = $offset + FeatureProdTableMap::NUM_HYDRATE_COLUMNS;
+            $col = $offset + FeatureProductTableMap::NUM_HYDRATE_COLUMNS;
         } else {
-            $cls = FeatureProdTableMap::OM_CLASS;
+            $cls = FeatureProductTableMap::OM_CLASS;
             $obj = new $cls();
             $col = $obj->hydrate($row, $offset, false, $indexType);
-            FeatureProdTableMap::addInstanceToPool($obj, $key);
+            FeatureProductTableMap::addInstanceToPool($obj, $key);
         }
 
         return array($obj, $col);
@@ -300,8 +300,8 @@ class FeatureProdTableMap extends TableMap
         $cls = static::getOMClass(false);
         // populate the object(s)
         while ($row = $dataFetcher->fetch()) {
-            $key = FeatureProdTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
+            $key = FeatureProductTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
-            if (null !== ($obj = FeatureProdTableMap::getInstanceFromPool($key))) {
+            if (null !== ($obj = FeatureProductTableMap::getInstanceFromPool($key))) {
                 // We no longer rehydrate the object, since this can cause data loss.
                 // See http://www.propelorm.org/ticket/509
                 // $obj->hydrate($row, 0, true); // rehydrate
@@ -310,7 +310,7 @@ class FeatureProdTableMap extends TableMap
                 $obj = new $cls();
                 $obj->hydrate($row);
                 $results[] = $obj;
-                FeatureProdTableMap::addInstanceToPool($obj, $key);
+                FeatureProductTableMap::addInstanceToPool($obj, $key);
             } // if key exists
         }
 
@@ -331,14 +331,14 @@ class FeatureProdTableMap extends TableMap
     public static function addSelectColumns(Criteria $criteria, $alias = null)
     {
         if (null === $alias) {
-            $criteria->addSelectColumn(FeatureProdTableMap::ID);
+            $criteria->addSelectColumn(FeatureProductTableMap::ID);
-            $criteria->addSelectColumn(FeatureProdTableMap::PRODUCT_ID);
+            $criteria->addSelectColumn(FeatureProductTableMap::PRODUCT_ID);
-            $criteria->addSelectColumn(FeatureProdTableMap::FEATURE_ID);
+            $criteria->addSelectColumn(FeatureProductTableMap::FEATURE_ID);
-            $criteria->addSelectColumn(FeatureProdTableMap::FEATURE_AV_ID);
+            $criteria->addSelectColumn(FeatureProductTableMap::FEATURE_AV_ID);
-            $criteria->addSelectColumn(FeatureProdTableMap::BY_DEFAULT);
+            $criteria->addSelectColumn(FeatureProductTableMap::BY_DEFAULT);
-            $criteria->addSelectColumn(FeatureProdTableMap::POSITION);
+            $criteria->addSelectColumn(FeatureProductTableMap::POSITION);
-            $criteria->addSelectColumn(FeatureProdTableMap::CREATED_AT);
+            $criteria->addSelectColumn(FeatureProductTableMap::CREATED_AT);
-            $criteria->addSelectColumn(FeatureProdTableMap::UPDATED_AT);
+            $criteria->addSelectColumn(FeatureProductTableMap::UPDATED_AT);
         } else {
             $criteria->addSelectColumn($alias . '.ID');
             $criteria->addSelectColumn($alias . '.PRODUCT_ID');
@@ -360,7 +360,7 @@ class FeatureProdTableMap extends TableMap
      */
     public static function getTableMap()
     {
-        return Propel::getServiceContainer()->getDatabaseMap(FeatureProdTableMap::DATABASE_NAME)->getTable(FeatureProdTableMap::TABLE_NAME);
+        return Propel::getServiceContainer()->getDatabaseMap(FeatureProductTableMap::DATABASE_NAME)->getTable(FeatureProductTableMap::TABLE_NAME);
     }
 
     /**
@@ -368,16 +368,16 @@ class FeatureProdTableMap extends TableMap
      */
     public static function buildTableMap()
     {
-      $dbMap = Propel::getServiceContainer()->getDatabaseMap(FeatureProdTableMap::DATABASE_NAME);
+      $dbMap = Propel::getServiceContainer()->getDatabaseMap(FeatureProductTableMap::DATABASE_NAME);
-      if (!$dbMap->hasTable(FeatureProdTableMap::TABLE_NAME)) {
+      if (!$dbMap->hasTable(FeatureProductTableMap::TABLE_NAME)) {
-        $dbMap->addTableObject(new FeatureProdTableMap());
+        $dbMap->addTableObject(new FeatureProductTableMap());
       }
     }
 
     /**
-     * Performs a DELETE on the database, given a FeatureProd or Criteria object OR a primary key value.
+     * Performs a DELETE on the database, given a FeatureProduct or Criteria object OR a primary key value.
      *
-     * @param mixed               $values Criteria or FeatureProd object or primary key or array of primary keys
+     * @param mixed               $values Criteria or FeatureProduct object or primary key or array of primary keys
      *              which is used to create the DELETE statement
      * @param ConnectionInterface $con the connection to use
      * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
@@ -388,25 +388,25 @@ class FeatureProdTableMap extends TableMap
      public static function doDelete($values, ConnectionInterface $con = null)
      {
         if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(FeatureProdTableMap::DATABASE_NAME);
+            $con = Propel::getServiceContainer()->getWriteConnection(FeatureProductTableMap::DATABASE_NAME);
         }
 
         if ($values instanceof Criteria) {
             // rename for clarity
             $criteria = $values;
-        } elseif ($values instanceof \Thelia\Model\FeatureProd) { // it's a model object
+        } elseif ($values instanceof \Thelia\Model\FeatureProduct) { // it's a model object
             // create criteria based on pk values
             $criteria = $values->buildPkeyCriteria();
         } else { // it's a primary key, or an array of pks
-            $criteria = new Criteria(FeatureProdTableMap::DATABASE_NAME);
+            $criteria = new Criteria(FeatureProductTableMap::DATABASE_NAME);
-            $criteria->add(FeatureProdTableMap::ID, (array) $values, Criteria::IN);
+            $criteria->add(FeatureProductTableMap::ID, (array) $values, Criteria::IN);
         }
 
-        $query = FeatureProdQuery::create()->mergeWith($criteria);
+        $query = FeatureProductQuery::create()->mergeWith($criteria);
 
-        if ($values instanceof Criteria) { FeatureProdTableMap::clearInstancePool();
+        if ($values instanceof Criteria) { FeatureProductTableMap::clearInstancePool();
         } elseif (!is_object($values)) { // it's a primary key, or an array of pks
-            foreach ((array) $values as $singleval) { FeatureProdTableMap::removeInstanceFromPool($singleval);
+            foreach ((array) $values as $singleval) { FeatureProductTableMap::removeInstanceFromPool($singleval);
             }
         }
 
@@ -414,20 +414,20 @@ class FeatureProdTableMap extends TableMap
     }
 
     /**
-     * Deletes all rows from the feature_prod table.
+     * Deletes all rows from the feature_product table.
      *
      * @param ConnectionInterface $con the connection to use
      * @return int The number of affected rows (if supported by underlying database driver).
      */
     public static function doDeleteAll(ConnectionInterface $con = null)
     {
-        return FeatureProdQuery::create()->doDeleteAll($con);
+        return FeatureProductQuery::create()->doDeleteAll($con);
     }
 
     /**
-     * Performs an INSERT on the database, given a FeatureProd or Criteria object.
+     * Performs an INSERT on the database, given a FeatureProduct or Criteria object.
      *
-     * @param mixed               $criteria Criteria or FeatureProd object containing data that is used to create the INSERT statement.
+     * @param mixed               $criteria Criteria or FeatureProduct object containing data that is used to create the INSERT statement.
      * @param ConnectionInterface $con the ConnectionInterface connection to use
      * @return mixed           The new primary key.
      * @throws PropelException Any exceptions caught during processing will be
@@ -436,22 +436,22 @@ class FeatureProdTableMap extends TableMap
     public static function doInsert($criteria, ConnectionInterface $con = null)
     {
         if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(FeatureProdTableMap::DATABASE_NAME);
+            $con = Propel::getServiceContainer()->getWriteConnection(FeatureProductTableMap::DATABASE_NAME);
         }
 
         if ($criteria instanceof Criteria) {
             $criteria = clone $criteria; // rename for clarity
         } else {
-            $criteria = $criteria->buildCriteria(); // build Criteria from FeatureProd object
+            $criteria = $criteria->buildCriteria(); // build Criteria from FeatureProduct object
         }
 
-        if ($criteria->containsKey(FeatureProdTableMap::ID) && $criteria->keyContainsValue(FeatureProdTableMap::ID) ) {
+        if ($criteria->containsKey(FeatureProductTableMap::ID) && $criteria->keyContainsValue(FeatureProductTableMap::ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.FeatureProdTableMap::ID.')');
+            throw new PropelException('Cannot insert a value for auto-increment primary key ('.FeatureProductTableMap::ID.')');
         }
 
 
         // Set the correct dbName
-        $query = FeatureProdQuery::create()->mergeWith($criteria);
+        $query = FeatureProductQuery::create()->mergeWith($criteria);
 
         try {
             // use transaction because $criteria could contain info
@@ -467,7 +467,7 @@ class FeatureProdTableMap extends TableMap
         return $pk;
     }
 
-} // FeatureProdTableMap
+} // FeatureProductTableMap
 // This is the static code needed to register the TableMap for this table with the main Propel class.
 //
-FeatureProdTableMap::buildTableMap();
+FeatureProductTableMap::buildTableMap();

core/lib/Thelia/Model/Map/FeatureTableMap.php

@@ -167,7 +167,7 @@ class FeatureTableMap extends TableMap
     public function buildRelations()
     {
         $this->addRelation('FeatureAv', '\\Thelia\\Model\\FeatureAv', RelationMap::ONE_TO_MANY, array('id' => 'feature_id', ), 'CASCADE', 'RESTRICT', 'FeatureAvs');
-        $this->addRelation('FeatureProd', '\\Thelia\\Model\\FeatureProd', RelationMap::ONE_TO_MANY, array('id' => 'feature_id', ), 'CASCADE', 'RESTRICT', 'FeatureProds');
+        $this->addRelation('FeatureProduct', '\\Thelia\\Model\\FeatureProduct', RelationMap::ONE_TO_MANY, array('id' => 'feature_id', ), 'CASCADE', 'RESTRICT', 'FeatureProducts');
         $this->addRelation('FeatureCategory', '\\Thelia\\Model\\FeatureCategory', RelationMap::ONE_TO_MANY, array('id' => 'feature_id', ), 'CASCADE', 'RESTRICT', 'FeatureCategories');
         $this->addRelation('FeatureI18n', '\\Thelia\\Model\\FeatureI18n', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'FeatureI18ns');
         $this->addRelation('Category', '\\Thelia\\Model\\Category', RelationMap::MANY_TO_MANY, array(), 'CASCADE', 'RESTRICT', 'Categories');
@@ -194,7 +194,7 @@ class FeatureTableMap extends TableMap
         // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool,
         // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule.
                 FeatureAvTableMap::clearInstancePool();
-                FeatureProdTableMap::clearInstancePool();
+                FeatureProductTableMap::clearInstancePool();
                 FeatureCategoryTableMap::clearInstancePool();
                 FeatureI18nTableMap::clearInstancePool();
             }

core/lib/Thelia/Model/Map/ProductPriceTableMap.php

@@ -0,0 +1,464 @@
+<?php
+
+namespace Thelia\Model\Map;
+
+use Propel\Runtime\Propel;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\InstancePoolTrait;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Exception\PropelException;
+use Propel\Runtime\Map\RelationMap;
+use Propel\Runtime\Map\TableMap;
+use Propel\Runtime\Map\TableMapTrait;
+use Thelia\Model\ProductPrice;
+use Thelia\Model\ProductPriceQuery;
+
+
+/**
+ * This class defines the structure of the 'product_price' table.
+ *
+ *
+ *
+ * This map class is used by Propel to do runtime db structure discovery.
+ * For example, the createSelectSql() method checks the type of a given column used in an
+ * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
+ * (i.e. if it's a text column type).
+ *
+ */
+class ProductPriceTableMap extends TableMap
+{
+    use InstancePoolTrait;
+    use TableMapTrait;
+    /**
+     * The (dot-path) name of this class
+     */
+    const CLASS_NAME = 'Thelia.Model.Map.ProductPriceTableMap';
+
+    /**
+     * The default database name for this class
+     */
+    const DATABASE_NAME = 'thelia';
+
+    /**
+     * The table name for this class
+     */
+    const TABLE_NAME = 'product_price';
+
+    /**
+     * The related Propel class for this table
+     */
+    const OM_CLASS = '\\Thelia\\Model\\ProductPrice';
+
+    /**
+     * A class that can be returned by this tableMap
+     */
+    const CLASS_DEFAULT = 'Thelia.Model.ProductPrice';
+
+    /**
+     * The total number of columns
+     */
+    const NUM_COLUMNS = 7;
+
+    /**
+     * The number of lazy-loaded columns
+     */
+    const NUM_LAZY_LOAD_COLUMNS = 0;
+
+    /**
+     * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
+     */
+    const NUM_HYDRATE_COLUMNS = 7;
+
+    /**
+     * the column name for the ID field
+     */
+    const ID = 'product_price.ID';
+
+    /**
+     * the column name for the STOCK_ID field
+     */
+    const STOCK_ID = 'product_price.STOCK_ID';
+
+    /**
+     * the column name for the CURRENCY_ID field
+     */
+    const CURRENCY_ID = 'product_price.CURRENCY_ID';
+
+    /**
+     * the column name for the PRICE field
+     */
+    const PRICE = 'product_price.PRICE';
+
+    /**
+     * the column name for the PROMO_PRICE field
+     */
+    const PROMO_PRICE = 'product_price.PROMO_PRICE';
+
+    /**
+     * the column name for the CREATED_AT field
+     */
+    const CREATED_AT = 'product_price.CREATED_AT';
+
+    /**
+     * the column name for the UPDATED_AT field
+     */
+    const UPDATED_AT = 'product_price.UPDATED_AT';
+
+    /**
+     * The default string format for model objects of the related table
+     */
+    const DEFAULT_STRING_FORMAT = 'YAML';
+
+    /**
+     * holds an array of fieldnames
+     *
+     * first dimension keys are the type constants
+     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
+     */
+    protected static $fieldNames = array (
+        self::TYPE_PHPNAME       => array('Id', 'StockId', 'CurrencyId', 'Price', 'PromoPrice', 'CreatedAt', 'UpdatedAt', ),
+        self::TYPE_STUDLYPHPNAME => array('id', 'stockId', 'currencyId', 'price', 'promoPrice', 'createdAt', 'updatedAt', ),
+        self::TYPE_COLNAME       => array(ProductPriceTableMap::ID, ProductPriceTableMap::STOCK_ID, ProductPriceTableMap::CURRENCY_ID, ProductPriceTableMap::PRICE, ProductPriceTableMap::PROMO_PRICE, ProductPriceTableMap::CREATED_AT, ProductPriceTableMap::UPDATED_AT, ),
+        self::TYPE_RAW_COLNAME   => array('ID', 'STOCK_ID', 'CURRENCY_ID', 'PRICE', 'PROMO_PRICE', 'CREATED_AT', 'UPDATED_AT', ),
+        self::TYPE_FIELDNAME     => array('id', 'stock_id', 'currency_id', 'price', 'promo_price', 'created_at', 'updated_at', ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
+    );
+
+    /**
+     * holds an array of keys for quick access to the fieldnames array
+     *
+     * first dimension keys are the type constants
+     * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
+     */
+    protected static $fieldKeys = array (
+        self::TYPE_PHPNAME       => array('Id' => 0, 'StockId' => 1, 'CurrencyId' => 2, 'Price' => 3, 'PromoPrice' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ),
+        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'stockId' => 1, 'currencyId' => 2, 'price' => 3, 'promoPrice' => 4, 'createdAt' => 5, 'updatedAt' => 6, ),
+        self::TYPE_COLNAME       => array(ProductPriceTableMap::ID => 0, ProductPriceTableMap::STOCK_ID => 1, ProductPriceTableMap::CURRENCY_ID => 2, ProductPriceTableMap::PRICE => 3, ProductPriceTableMap::PROMO_PRICE => 4, ProductPriceTableMap::CREATED_AT => 5, ProductPriceTableMap::UPDATED_AT => 6, ),
+        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'STOCK_ID' => 1, 'CURRENCY_ID' => 2, 'PRICE' => 3, 'PROMO_PRICE' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'stock_id' => 1, 'currency_id' => 2, 'price' => 3, 'promo_price' => 4, 'created_at' => 5, 'updated_at' => 6, ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
+    );
+
+    /**
+     * Initialize the table attributes and columns
+     * Relations are not initialized by this method since they are lazy loaded
+     *
+     * @return void
+     * @throws PropelException
+     */
+    public function initialize()
+    {
+        // attributes
+        $this->setName('product_price');
+        $this->setPhpName('ProductPrice');
+        $this->setClassName('\\Thelia\\Model\\ProductPrice');
+        $this->setPackage('Thelia.Model');
+        $this->setUseIdGenerator(true);
+        // columns
+        $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
+        $this->addForeignKey('STOCK_ID', 'StockId', 'INTEGER', 'stock', 'ID', true, null, null);
+        $this->addForeignKey('CURRENCY_ID', 'CurrencyId', 'INTEGER', 'currency', 'ID', true, null, null);
+        $this->addColumn('PRICE', 'Price', 'FLOAT', true, null, null);
+        $this->addColumn('PROMO_PRICE', 'PromoPrice', 'FLOAT', false, null, null);
+        $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
+        $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
+    } // initialize()
+
+    /**
+     * Build the RelationMap objects for this table relationships
+     */
+    public function buildRelations()
+    {
+        $this->addRelation('Stock', '\\Thelia\\Model\\Stock', RelationMap::MANY_TO_ONE, array('stock_id' => 'id', ), null, null);
+        $this->addRelation('Currency', '\\Thelia\\Model\\Currency', RelationMap::MANY_TO_ONE, array('currency_id' => 'id', ), null, null);
+    } // buildRelations()
+
+    /**
+     *
+     * Gets the list of behaviors registered for this table
+     *
+     * @return array Associative array (name => parameters) of behaviors
+     */
+    public function getBehaviors()
+    {
+        return array(
+            'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
+        );
+    } // getBehaviors()
+
+    /**
+     * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
+     *
+     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+     * a multi-column primary key, a serialize()d version of the primary key will be returned.
+     *
+     * @param array  $row       resultset row.
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+     */
+    public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+        // If the PK cannot be derived from the row, return NULL.
+        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+            return null;
+        }
+
+        return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+    }
+
+    /**
+     * Retrieves the primary key from the DB resultset row
+     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+     * a multi-column primary key, an array of the primary key columns will be returned.
+     *
+     * @param array  $row       resultset row.
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+     *
+     * @return mixed The primary key of the row
+     */
+    public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+
+            return (int) $row[
+                            $indexType == TableMap::TYPE_NUM
+                            ? 0 + $offset
+                            : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
+                        ];
+    }
+
+    /**
+     * The class that the tableMap will make instances of.
+     *
+     * If $withPrefix is true, the returned path
+     * uses a dot-path notation which is translated into a path
+     * relative to a location on the PHP include_path.
+     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
+     *
+     * @param boolean $withPrefix Whether or not to return the path with the class name
+     * @return string path.to.ClassName
+     */
+    public static function getOMClass($withPrefix = true)
+    {
+        return $withPrefix ? ProductPriceTableMap::CLASS_DEFAULT : ProductPriceTableMap::OM_CLASS;
+    }
+
+    /**
+     * Populates an object of the default type or an object that inherit from the default.
+     *
+     * @param array  $row       row returned by DataFetcher->fetch().
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+                                 One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     * @return array (ProductPrice object, last column rank)
+     */
+    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+        $key = ProductPriceTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
+        if (null !== ($obj = ProductPriceTableMap::getInstanceFromPool($key))) {
+            // We no longer rehydrate the object, since this can cause data loss.
+            // See http://www.propelorm.org/ticket/509
+            // $obj->hydrate($row, $offset, true); // rehydrate
+            $col = $offset + ProductPriceTableMap::NUM_HYDRATE_COLUMNS;
+        } else {
+            $cls = ProductPriceTableMap::OM_CLASS;
+            $obj = new $cls();
+            $col = $obj->hydrate($row, $offset, false, $indexType);
+            ProductPriceTableMap::addInstanceToPool($obj, $key);
+        }
+
+        return array($obj, $col);
+    }
+
+    /**
+     * The returned array will contain objects of the default type or
+     * objects that inherit from the default.
+     *
+     * @param DataFetcherInterface $dataFetcher
+     * @return array
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function populateObjects(DataFetcherInterface $dataFetcher)
+    {
+        $results = array();
+
+        // set the class once to avoid overhead in the loop
+        $cls = static::getOMClass(false);
+        // populate the object(s)
+        while ($row = $dataFetcher->fetch()) {
+            $key = ProductPriceTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
+            if (null !== ($obj = ProductPriceTableMap::getInstanceFromPool($key))) {
+                // We no longer rehydrate the object, since this can cause data loss.
+                // See http://www.propelorm.org/ticket/509
+                // $obj->hydrate($row, 0, true); // rehydrate
+                $results[] = $obj;
+            } else {
+                $obj = new $cls();
+                $obj->hydrate($row);
+                $results[] = $obj;
+                ProductPriceTableMap::addInstanceToPool($obj, $key);
+            } // if key exists
+        }
+
+        return $results;
+    }
+    /**
+     * Add all the columns needed to create a new object.
+     *
+     * Note: any columns that were marked with lazyLoad="true" in the
+     * XML schema will not be added to the select list and only loaded
+     * on demand.
+     *
+     * @param Criteria $criteria object containing the columns to add.
+     * @param string   $alias    optional table alias
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function addSelectColumns(Criteria $criteria, $alias = null)
+    {
+        if (null === $alias) {
+            $criteria->addSelectColumn(ProductPriceTableMap::ID);
+            $criteria->addSelectColumn(ProductPriceTableMap::STOCK_ID);
+            $criteria->addSelectColumn(ProductPriceTableMap::CURRENCY_ID);
+            $criteria->addSelectColumn(ProductPriceTableMap::PRICE);
+            $criteria->addSelectColumn(ProductPriceTableMap::PROMO_PRICE);
+            $criteria->addSelectColumn(ProductPriceTableMap::CREATED_AT);
+            $criteria->addSelectColumn(ProductPriceTableMap::UPDATED_AT);
+        } else {
+            $criteria->addSelectColumn($alias . '.ID');
+            $criteria->addSelectColumn($alias . '.STOCK_ID');
+            $criteria->addSelectColumn($alias . '.CURRENCY_ID');
+            $criteria->addSelectColumn($alias . '.PRICE');
+            $criteria->addSelectColumn($alias . '.PROMO_PRICE');
+            $criteria->addSelectColumn($alias . '.CREATED_AT');
+            $criteria->addSelectColumn($alias . '.UPDATED_AT');
+        }
+    }
+
+    /**
+     * Returns the TableMap related to this object.
+     * This method is not needed for general use but a specific application could have a need.
+     * @return TableMap
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function getTableMap()
+    {
+        return Propel::getServiceContainer()->getDatabaseMap(ProductPriceTableMap::DATABASE_NAME)->getTable(ProductPriceTableMap::TABLE_NAME);
+    }
+
+    /**
+     * Add a TableMap instance to the database for this tableMap class.
+     */
+    public static function buildTableMap()
+    {
+      $dbMap = Propel::getServiceContainer()->getDatabaseMap(ProductPriceTableMap::DATABASE_NAME);
+      if (!$dbMap->hasTable(ProductPriceTableMap::TABLE_NAME)) {
+        $dbMap->addTableObject(new ProductPriceTableMap());
+      }
+    }
+
+    /**
+     * Performs a DELETE on the database, given a ProductPrice or Criteria object OR a primary key value.
+     *
+     * @param mixed               $values Criteria or ProductPrice object or primary key or array of primary keys
+     *              which is used to create the DELETE statement
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     *                if supported by native driver or if emulated using Propel.
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+     public static function doDelete($values, ConnectionInterface $con = null)
+     {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(ProductPriceTableMap::DATABASE_NAME);
+        }
+
+        if ($values instanceof Criteria) {
+            // rename for clarity
+            $criteria = $values;
+        } elseif ($values instanceof \Thelia\Model\ProductPrice) { // it's a model object
+            // create criteria based on pk values
+            $criteria = $values->buildPkeyCriteria();
+        } else { // it's a primary key, or an array of pks
+            $criteria = new Criteria(ProductPriceTableMap::DATABASE_NAME);
+            $criteria->add(ProductPriceTableMap::ID, (array) $values, Criteria::IN);
+        }
+
+        $query = ProductPriceQuery::create()->mergeWith($criteria);
+
+        if ($values instanceof Criteria) { ProductPriceTableMap::clearInstancePool();
+        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
+            foreach ((array) $values as $singleval) { ProductPriceTableMap::removeInstanceFromPool($singleval);
+            }
+        }
+
+        return $query->delete($con);
+    }
+
+    /**
+     * Deletes all rows from the product_price table.
+     *
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).
+     */
+    public static function doDeleteAll(ConnectionInterface $con = null)
+    {
+        return ProductPriceQuery::create()->doDeleteAll($con);
+    }
+
+    /**
+     * Performs an INSERT on the database, given a ProductPrice or Criteria object.
+     *
+     * @param mixed               $criteria Criteria or ProductPrice object containing data that is used to create the INSERT statement.
+     * @param ConnectionInterface $con the ConnectionInterface connection to use
+     * @return mixed           The new primary key.
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function doInsert($criteria, ConnectionInterface $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(ProductPriceTableMap::DATABASE_NAME);
+        }
+
+        if ($criteria instanceof Criteria) {
+            $criteria = clone $criteria; // rename for clarity
+        } else {
+            $criteria = $criteria->buildCriteria(); // build Criteria from ProductPrice object
+        }
+
+        if ($criteria->containsKey(ProductPriceTableMap::ID) && $criteria->keyContainsValue(ProductPriceTableMap::ID) ) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key ('.ProductPriceTableMap::ID.')');
+        }
+
+
+        // Set the correct dbName
+        $query = ProductPriceQuery::create()->mergeWith($criteria);
+
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table (I guess, conceivably)
+            $con->beginTransaction();
+            $pk = $query->doInsert($con);
+            $con->commit();
+        } catch (PropelException $e) {
+            $con->rollBack();
+            throw $e;
+        }
+
+        return $pk;
+    }
+
+} // ProductPriceTableMap
+// This is the static code needed to register the TableMap for this table with the main Propel class.
+//
+ProductPriceTableMap::buildTableMap();

core/lib/Thelia/Model/Map/ProductTableMap.php

@@ -57,7 +57,7 @@ class ProductTableMap extends TableMap
     /**
      * The total number of columns
      */
-    const NUM_COLUMNS = 17;
+    const NUM_COLUMNS = 10;
 
     /**
      * The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class ProductTableMap extends TableMap
     /**
      * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
      */
-    const NUM_HYDRATE_COLUMNS = 17;
+    const NUM_HYDRATE_COLUMNS = 10;
 
     /**
      * the column name for the ID field
@@ -84,46 +84,11 @@ class ProductTableMap extends TableMap
      */
     const REF = 'product.REF';
 
-    /**
-     * the column name for the PRICE field
-     */
-    const PRICE = 'product.PRICE';
-
-    /**
-     * the column name for the PRICE2 field
-     */
-    const PRICE2 = 'product.PRICE2';
-
-    /**
-     * the column name for the ECOTAX field
-     */
-    const ECOTAX = 'product.ECOTAX';
-
-    /**
-     * the column name for the NEWNESS field
-     */
-    const NEWNESS = 'product.NEWNESS';
-
-    /**
-     * the column name for the PROMO field
-     */
-    const PROMO = 'product.PROMO';
-
-    /**
-     * the column name for the QUANTITY field
-     */
-    const QUANTITY = 'product.QUANTITY';
-
     /**
      * the column name for the VISIBLE field
      */
     const VISIBLE = 'product.VISIBLE';
 
-    /**
-     * the column name for the WEIGHT field
-     */
-    const WEIGHT = 'product.WEIGHT';
-
     /**
      * the column name for the POSITION field
      */
@@ -175,12 +140,12 @@ class ProductTableMap extends TableMap
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'TaxRuleId', 'Ref', 'Price', 'Price2', 'Ecotax', 'Newness', 'Promo', 'Quantity', 'Visible', 'Weight', 'Position', 'CreatedAt', 'UpdatedAt', 'Version', 'VersionCreatedAt', 'VersionCreatedBy', ),
+        self::TYPE_PHPNAME       => array('Id', 'TaxRuleId', 'Ref', 'Visible', 'Position', 'CreatedAt', 'UpdatedAt', 'Version', 'VersionCreatedAt', 'VersionCreatedBy', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'taxRuleId', 'ref', 'price', 'price2', 'ecotax', 'newness', 'promo', 'quantity', 'visible', 'weight', 'position', 'createdAt', 'updatedAt', 'version', 'versionCreatedAt', 'versionCreatedBy', ),
+        self::TYPE_STUDLYPHPNAME => array('id', 'taxRuleId', 'ref', 'visible', 'position', 'createdAt', 'updatedAt', 'version', 'versionCreatedAt', 'versionCreatedBy', ),
-        self::TYPE_COLNAME       => array(ProductTableMap::ID, ProductTableMap::TAX_RULE_ID, ProductTableMap::REF, ProductTableMap::PRICE, ProductTableMap::PRICE2, ProductTableMap::ECOTAX, ProductTableMap::NEWNESS, ProductTableMap::PROMO, ProductTableMap::QUANTITY, ProductTableMap::VISIBLE, ProductTableMap::WEIGHT, ProductTableMap::POSITION, ProductTableMap::CREATED_AT, ProductTableMap::UPDATED_AT, ProductTableMap::VERSION, ProductTableMap::VERSION_CREATED_AT, ProductTableMap::VERSION_CREATED_BY, ),
+        self::TYPE_COLNAME       => array(ProductTableMap::ID, ProductTableMap::TAX_RULE_ID, ProductTableMap::REF, ProductTableMap::VISIBLE, ProductTableMap::POSITION, ProductTableMap::CREATED_AT, ProductTableMap::UPDATED_AT, ProductTableMap::VERSION, ProductTableMap::VERSION_CREATED_AT, ProductTableMap::VERSION_CREATED_BY, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'TAX_RULE_ID', 'REF', 'PRICE', 'PRICE2', 'ECOTAX', 'NEWNESS', 'PROMO', 'QUANTITY', 'VISIBLE', 'WEIGHT', 'POSITION', 'CREATED_AT', 'UPDATED_AT', 'VERSION', 'VERSION_CREATED_AT', 'VERSION_CREATED_BY', ),
+        self::TYPE_RAW_COLNAME   => array('ID', 'TAX_RULE_ID', 'REF', 'VISIBLE', 'POSITION', 'CREATED_AT', 'UPDATED_AT', 'VERSION', 'VERSION_CREATED_AT', 'VERSION_CREATED_BY', ),
-        self::TYPE_FIELDNAME     => array('id', 'tax_rule_id', 'ref', 'price', 'price2', 'ecotax', 'newness', 'promo', 'quantity', 'visible', 'weight', 'position', 'created_at', 'updated_at', 'version', 'version_created_at', 'version_created_by', ),
+        self::TYPE_FIELDNAME     => array('id', 'tax_rule_id', 'ref', 'visible', 'position', 'created_at', 'updated_at', 'version', 'version_created_at', 'version_created_by', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, )
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
     );
 
     /**
@@ -190,12 +155,12 @@ class ProductTableMap extends TableMap
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
     protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'TaxRuleId' => 1, 'Ref' => 2, 'Price' => 3, 'Price2' => 4, 'Ecotax' => 5, 'Newness' => 6, 'Promo' => 7, 'Quantity' => 8, 'Visible' => 9, 'Weight' => 10, 'Position' => 11, 'CreatedAt' => 12, 'UpdatedAt' => 13, 'Version' => 14, 'VersionCreatedAt' => 15, 'VersionCreatedBy' => 16, ),
+        self::TYPE_PHPNAME       => array('Id' => 0, 'TaxRuleId' => 1, 'Ref' => 2, 'Visible' => 3, 'Position' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, 'Version' => 7, 'VersionCreatedAt' => 8, 'VersionCreatedBy' => 9, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'taxRuleId' => 1, 'ref' => 2, 'price' => 3, 'price2' => 4, 'ecotax' => 5, 'newness' => 6, 'promo' => 7, 'quantity' => 8, 'visible' => 9, 'weight' => 10, 'position' => 11, 'createdAt' => 12, 'updatedAt' => 13, 'version' => 14, 'versionCreatedAt' => 15, 'versionCreatedBy' => 16, ),
+        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'taxRuleId' => 1, 'ref' => 2, 'visible' => 3, 'position' => 4, 'createdAt' => 5, 'updatedAt' => 6, 'version' => 7, 'versionCreatedAt' => 8, 'versionCreatedBy' => 9, ),
-        self::TYPE_COLNAME       => array(ProductTableMap::ID => 0, ProductTableMap::TAX_RULE_ID => 1, ProductTableMap::REF => 2, ProductTableMap::PRICE => 3, ProductTableMap::PRICE2 => 4, ProductTableMap::ECOTAX => 5, ProductTableMap::NEWNESS => 6, ProductTableMap::PROMO => 7, ProductTableMap::QUANTITY => 8, ProductTableMap::VISIBLE => 9, ProductTableMap::WEIGHT => 10, ProductTableMap::POSITION => 11, ProductTableMap::CREATED_AT => 12, ProductTableMap::UPDATED_AT => 13, ProductTableMap::VERSION => 14, ProductTableMap::VERSION_CREATED_AT => 15, ProductTableMap::VERSION_CREATED_BY => 16, ),
+        self::TYPE_COLNAME       => array(ProductTableMap::ID => 0, ProductTableMap::TAX_RULE_ID => 1, ProductTableMap::REF => 2, ProductTableMap::VISIBLE => 3, ProductTableMap::POSITION => 4, ProductTableMap::CREATED_AT => 5, ProductTableMap::UPDATED_AT => 6, ProductTableMap::VERSION => 7, ProductTableMap::VERSION_CREATED_AT => 8, ProductTableMap::VERSION_CREATED_BY => 9, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'TAX_RULE_ID' => 1, 'REF' => 2, 'PRICE' => 3, 'PRICE2' => 4, 'ECOTAX' => 5, 'NEWNESS' => 6, 'PROMO' => 7, 'QUANTITY' => 8, 'VISIBLE' => 9, 'WEIGHT' => 10, 'POSITION' => 11, 'CREATED_AT' => 12, 'UPDATED_AT' => 13, 'VERSION' => 14, 'VERSION_CREATED_AT' => 15, 'VERSION_CREATED_BY' => 16, ),
+        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'TAX_RULE_ID' => 1, 'REF' => 2, 'VISIBLE' => 3, 'POSITION' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, 'VERSION' => 7, 'VERSION_CREATED_AT' => 8, 'VERSION_CREATED_BY' => 9, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'tax_rule_id' => 1, 'ref' => 2, 'price' => 3, 'price2' => 4, 'ecotax' => 5, 'newness' => 6, 'promo' => 7, 'quantity' => 8, 'visible' => 9, 'weight' => 10, 'position' => 11, 'created_at' => 12, 'updated_at' => 13, 'version' => 14, 'version_created_at' => 15, 'version_created_by' => 16, ),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'tax_rule_id' => 1, 'ref' => 2, 'visible' => 3, 'position' => 4, 'created_at' => 5, 'updated_at' => 6, 'version' => 7, 'version_created_at' => 8, 'version_created_by' => 9, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, )
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
     );
 
     /**
@@ -217,14 +182,7 @@ class ProductTableMap extends TableMap
         $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
         $this->addForeignKey('TAX_RULE_ID', 'TaxRuleId', 'INTEGER', 'tax_rule', 'ID', false, null, null);
         $this->addColumn('REF', 'Ref', 'VARCHAR', true, 255, null);
-        $this->addColumn('PRICE', 'Price', 'FLOAT', true, null, null);
-        $this->addColumn('PRICE2', 'Price2', 'FLOAT', false, null, null);
-        $this->addColumn('ECOTAX', 'Ecotax', 'FLOAT', false, null, null);
-        $this->addColumn('NEWNESS', 'Newness', 'TINYINT', false, null, 0);
-        $this->addColumn('PROMO', 'Promo', 'TINYINT', false, null, 0);
-        $this->addColumn('QUANTITY', 'Quantity', 'INTEGER', false, null, 0);
         $this->addColumn('VISIBLE', 'Visible', 'TINYINT', true, null, 0);
-        $this->addColumn('WEIGHT', 'Weight', 'FLOAT', false, null, null);
         $this->addColumn('POSITION', 'Position', 'INTEGER', true, null, null);
         $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
         $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
@@ -240,7 +198,7 @@ class ProductTableMap extends TableMap
     {
         $this->addRelation('TaxRule', '\\Thelia\\Model\\TaxRule', RelationMap::MANY_TO_ONE, array('tax_rule_id' => 'id', ), 'SET NULL', 'RESTRICT');
         $this->addRelation('ProductCategory', '\\Thelia\\Model\\ProductCategory', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'ProductCategories');
-        $this->addRelation('FeatureProd', '\\Thelia\\Model\\FeatureProd', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'FeatureProds');
+        $this->addRelation('FeatureProduct', '\\Thelia\\Model\\FeatureProduct', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'FeatureProducts');
         $this->addRelation('Stock', '\\Thelia\\Model\\Stock', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'Stocks');
         $this->addRelation('ContentAssoc', '\\Thelia\\Model\\ContentAssoc', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'ContentAssocs');
         $this->addRelation('Image', '\\Thelia\\Model\\Image', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'Images');
@@ -278,7 +236,7 @@ class ProductTableMap extends TableMap
         // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool,
         // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule.
                 ProductCategoryTableMap::clearInstancePool();
-                FeatureProdTableMap::clearInstancePool();
+                FeatureProductTableMap::clearInstancePool();
                 StockTableMap::clearInstancePool();
                 ContentAssocTableMap::clearInstancePool();
                 ImageTableMap::clearInstancePool();
@@ -430,14 +388,7 @@ class ProductTableMap extends TableMap
             $criteria->addSelectColumn(ProductTableMap::ID);
             $criteria->addSelectColumn(ProductTableMap::TAX_RULE_ID);
             $criteria->addSelectColumn(ProductTableMap::REF);
-            $criteria->addSelectColumn(ProductTableMap::PRICE);
-            $criteria->addSelectColumn(ProductTableMap::PRICE2);
-            $criteria->addSelectColumn(ProductTableMap::ECOTAX);
-            $criteria->addSelectColumn(ProductTableMap::NEWNESS);
-            $criteria->addSelectColumn(ProductTableMap::PROMO);
-            $criteria->addSelectColumn(ProductTableMap::QUANTITY);
             $criteria->addSelectColumn(ProductTableMap::VISIBLE);
-            $criteria->addSelectColumn(ProductTableMap::WEIGHT);
             $criteria->addSelectColumn(ProductTableMap::POSITION);
             $criteria->addSelectColumn(ProductTableMap::CREATED_AT);
             $criteria->addSelectColumn(ProductTableMap::UPDATED_AT);
@@ -448,14 +399,7 @@ class ProductTableMap extends TableMap
             $criteria->addSelectColumn($alias . '.ID');
             $criteria->addSelectColumn($alias . '.TAX_RULE_ID');
             $criteria->addSelectColumn($alias . '.REF');
-            $criteria->addSelectColumn($alias . '.PRICE');
-            $criteria->addSelectColumn($alias . '.PRICE2');
-            $criteria->addSelectColumn($alias . '.ECOTAX');
-            $criteria->addSelectColumn($alias . '.NEWNESS');
-            $criteria->addSelectColumn($alias . '.PROMO');
-            $criteria->addSelectColumn($alias . '.QUANTITY');
             $criteria->addSelectColumn($alias . '.VISIBLE');
-            $criteria->addSelectColumn($alias . '.WEIGHT');
             $criteria->addSelectColumn($alias . '.POSITION');
             $criteria->addSelectColumn($alias . '.CREATED_AT');
             $criteria->addSelectColumn($alias . '.UPDATED_AT');

core/lib/Thelia/Model/Map/ProductVersionTableMap.php

@@ -57,7 +57,7 @@ class ProductVersionTableMap extends TableMap
     /**
      * The total number of columns
      */
-    const NUM_COLUMNS = 17;
+    const NUM_COLUMNS = 10;
 
     /**
      * The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class ProductVersionTableMap extends TableMap
     /**
      * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
      */
-    const NUM_HYDRATE_COLUMNS = 17;
+    const NUM_HYDRATE_COLUMNS = 10;
 
     /**
      * the column name for the ID field
@@ -84,46 +84,11 @@ class ProductVersionTableMap extends TableMap
      */
     const REF = 'product_version.REF';
 
-    /**
-     * the column name for the PRICE field
-     */
-    const PRICE = 'product_version.PRICE';
-
-    /**
-     * the column name for the PRICE2 field
-     */
-    const PRICE2 = 'product_version.PRICE2';
-
-    /**
-     * the column name for the ECOTAX field
-     */
-    const ECOTAX = 'product_version.ECOTAX';
-
-    /**
-     * the column name for the NEWNESS field
-     */
-    const NEWNESS = 'product_version.NEWNESS';
-
-    /**
-     * the column name for the PROMO field
-     */
-    const PROMO = 'product_version.PROMO';
-
-    /**
-     * the column name for the QUANTITY field
-     */
-    const QUANTITY = 'product_version.QUANTITY';
-
     /**
      * the column name for the VISIBLE field
      */
     const VISIBLE = 'product_version.VISIBLE';
 
-    /**
-     * the column name for the WEIGHT field
-     */
-    const WEIGHT = 'product_version.WEIGHT';
-
     /**
      * the column name for the POSITION field
      */
@@ -166,12 +131,12 @@ class ProductVersionTableMap extends TableMap
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'TaxRuleId', 'Ref', 'Price', 'Price2', 'Ecotax', 'Newness', 'Promo', 'Quantity', 'Visible', 'Weight', 'Position', 'CreatedAt', 'UpdatedAt', 'Version', 'VersionCreatedAt', 'VersionCreatedBy', ),
+        self::TYPE_PHPNAME       => array('Id', 'TaxRuleId', 'Ref', 'Visible', 'Position', 'CreatedAt', 'UpdatedAt', 'Version', 'VersionCreatedAt', 'VersionCreatedBy', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'taxRuleId', 'ref', 'price', 'price2', 'ecotax', 'newness', 'promo', 'quantity', 'visible', 'weight', 'position', 'createdAt', 'updatedAt', 'version', 'versionCreatedAt', 'versionCreatedBy', ),
+        self::TYPE_STUDLYPHPNAME => array('id', 'taxRuleId', 'ref', 'visible', 'position', 'createdAt', 'updatedAt', 'version', 'versionCreatedAt', 'versionCreatedBy', ),
-        self::TYPE_COLNAME       => array(ProductVersionTableMap::ID, ProductVersionTableMap::TAX_RULE_ID, ProductVersionTableMap::REF, ProductVersionTableMap::PRICE, ProductVersionTableMap::PRICE2, ProductVersionTableMap::ECOTAX, ProductVersionTableMap::NEWNESS, ProductVersionTableMap::PROMO, ProductVersionTableMap::QUANTITY, ProductVersionTableMap::VISIBLE, ProductVersionTableMap::WEIGHT, ProductVersionTableMap::POSITION, ProductVersionTableMap::CREATED_AT, ProductVersionTableMap::UPDATED_AT, ProductVersionTableMap::VERSION, ProductVersionTableMap::VERSION_CREATED_AT, ProductVersionTableMap::VERSION_CREATED_BY, ),
+        self::TYPE_COLNAME       => array(ProductVersionTableMap::ID, ProductVersionTableMap::TAX_RULE_ID, ProductVersionTableMap::REF, ProductVersionTableMap::VISIBLE, ProductVersionTableMap::POSITION, ProductVersionTableMap::CREATED_AT, ProductVersionTableMap::UPDATED_AT, ProductVersionTableMap::VERSION, ProductVersionTableMap::VERSION_CREATED_AT, ProductVersionTableMap::VERSION_CREATED_BY, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'TAX_RULE_ID', 'REF', 'PRICE', 'PRICE2', 'ECOTAX', 'NEWNESS', 'PROMO', 'QUANTITY', 'VISIBLE', 'WEIGHT', 'POSITION', 'CREATED_AT', 'UPDATED_AT', 'VERSION', 'VERSION_CREATED_AT', 'VERSION_CREATED_BY', ),
+        self::TYPE_RAW_COLNAME   => array('ID', 'TAX_RULE_ID', 'REF', 'VISIBLE', 'POSITION', 'CREATED_AT', 'UPDATED_AT', 'VERSION', 'VERSION_CREATED_AT', 'VERSION_CREATED_BY', ),
-        self::TYPE_FIELDNAME     => array('id', 'tax_rule_id', 'ref', 'price', 'price2', 'ecotax', 'newness', 'promo', 'quantity', 'visible', 'weight', 'position', 'created_at', 'updated_at', 'version', 'version_created_at', 'version_created_by', ),
+        self::TYPE_FIELDNAME     => array('id', 'tax_rule_id', 'ref', 'visible', 'position', 'created_at', 'updated_at', 'version', 'version_created_at', 'version_created_by', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, )
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
     );
 
     /**
@@ -181,12 +146,12 @@ class ProductVersionTableMap extends TableMap
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
     protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'TaxRuleId' => 1, 'Ref' => 2, 'Price' => 3, 'Price2' => 4, 'Ecotax' => 5, 'Newness' => 6, 'Promo' => 7, 'Quantity' => 8, 'Visible' => 9, 'Weight' => 10, 'Position' => 11, 'CreatedAt' => 12, 'UpdatedAt' => 13, 'Version' => 14, 'VersionCreatedAt' => 15, 'VersionCreatedBy' => 16, ),
+        self::TYPE_PHPNAME       => array('Id' => 0, 'TaxRuleId' => 1, 'Ref' => 2, 'Visible' => 3, 'Position' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, 'Version' => 7, 'VersionCreatedAt' => 8, 'VersionCreatedBy' => 9, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'taxRuleId' => 1, 'ref' => 2, 'price' => 3, 'price2' => 4, 'ecotax' => 5, 'newness' => 6, 'promo' => 7, 'quantity' => 8, 'visible' => 9, 'weight' => 10, 'position' => 11, 'createdAt' => 12, 'updatedAt' => 13, 'version' => 14, 'versionCreatedAt' => 15, 'versionCreatedBy' => 16, ),
+        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'taxRuleId' => 1, 'ref' => 2, 'visible' => 3, 'position' => 4, 'createdAt' => 5, 'updatedAt' => 6, 'version' => 7, 'versionCreatedAt' => 8, 'versionCreatedBy' => 9, ),
-        self::TYPE_COLNAME       => array(ProductVersionTableMap::ID => 0, ProductVersionTableMap::TAX_RULE_ID => 1, ProductVersionTableMap::REF => 2, ProductVersionTableMap::PRICE => 3, ProductVersionTableMap::PRICE2 => 4, ProductVersionTableMap::ECOTAX => 5, ProductVersionTableMap::NEWNESS => 6, ProductVersionTableMap::PROMO => 7, ProductVersionTableMap::QUANTITY => 8, ProductVersionTableMap::VISIBLE => 9, ProductVersionTableMap::WEIGHT => 10, ProductVersionTableMap::POSITION => 11, ProductVersionTableMap::CREATED_AT => 12, ProductVersionTableMap::UPDATED_AT => 13, ProductVersionTableMap::VERSION => 14, ProductVersionTableMap::VERSION_CREATED_AT => 15, ProductVersionTableMap::VERSION_CREATED_BY => 16, ),
+        self::TYPE_COLNAME       => array(ProductVersionTableMap::ID => 0, ProductVersionTableMap::TAX_RULE_ID => 1, ProductVersionTableMap::REF => 2, ProductVersionTableMap::VISIBLE => 3, ProductVersionTableMap::POSITION => 4, ProductVersionTableMap::CREATED_AT => 5, ProductVersionTableMap::UPDATED_AT => 6, ProductVersionTableMap::VERSION => 7, ProductVersionTableMap::VERSION_CREATED_AT => 8, ProductVersionTableMap::VERSION_CREATED_BY => 9, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'TAX_RULE_ID' => 1, 'REF' => 2, 'PRICE' => 3, 'PRICE2' => 4, 'ECOTAX' => 5, 'NEWNESS' => 6, 'PROMO' => 7, 'QUANTITY' => 8, 'VISIBLE' => 9, 'WEIGHT' => 10, 'POSITION' => 11, 'CREATED_AT' => 12, 'UPDATED_AT' => 13, 'VERSION' => 14, 'VERSION_CREATED_AT' => 15, 'VERSION_CREATED_BY' => 16, ),
+        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'TAX_RULE_ID' => 1, 'REF' => 2, 'VISIBLE' => 3, 'POSITION' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, 'VERSION' => 7, 'VERSION_CREATED_AT' => 8, 'VERSION_CREATED_BY' => 9, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'tax_rule_id' => 1, 'ref' => 2, 'price' => 3, 'price2' => 4, 'ecotax' => 5, 'newness' => 6, 'promo' => 7, 'quantity' => 8, 'visible' => 9, 'weight' => 10, 'position' => 11, 'created_at' => 12, 'updated_at' => 13, 'version' => 14, 'version_created_at' => 15, 'version_created_by' => 16, ),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'tax_rule_id' => 1, 'ref' => 2, 'visible' => 3, 'position' => 4, 'created_at' => 5, 'updated_at' => 6, 'version' => 7, 'version_created_at' => 8, 'version_created_by' => 9, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, )
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
     );
 
     /**
@@ -208,14 +173,7 @@ class ProductVersionTableMap extends TableMap
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'product', 'ID', true, null, null);
         $this->addColumn('TAX_RULE_ID', 'TaxRuleId', 'INTEGER', false, null, null);
         $this->addColumn('REF', 'Ref', 'VARCHAR', true, 255, null);
-        $this->addColumn('PRICE', 'Price', 'FLOAT', true, null, null);
-        $this->addColumn('PRICE2', 'Price2', 'FLOAT', false, null, null);
-        $this->addColumn('ECOTAX', 'Ecotax', 'FLOAT', false, null, null);
-        $this->addColumn('NEWNESS', 'Newness', 'TINYINT', false, null, 0);
-        $this->addColumn('PROMO', 'Promo', 'TINYINT', false, null, 0);
-        $this->addColumn('QUANTITY', 'Quantity', 'INTEGER', false, null, 0);
         $this->addColumn('VISIBLE', 'Visible', 'TINYINT', true, null, 0);
-        $this->addColumn('WEIGHT', 'Weight', 'FLOAT', false, null, null);
         $this->addColumn('POSITION', 'Position', 'INTEGER', true, null, null);
         $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
         $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
@@ -299,11 +257,11 @@ class ProductVersionTableMap extends TableMap
     public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
     {
         // If the PK cannot be derived from the row, return NULL.
-        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 14 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 7 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)] === null) {
             return null;
         }
 
-        return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 14 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]));
+        return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 7 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]));
     }
 
     /**
@@ -422,14 +380,7 @@ class ProductVersionTableMap extends TableMap
             $criteria->addSelectColumn(ProductVersionTableMap::ID);
             $criteria->addSelectColumn(ProductVersionTableMap::TAX_RULE_ID);
             $criteria->addSelectColumn(ProductVersionTableMap::REF);
-            $criteria->addSelectColumn(ProductVersionTableMap::PRICE);
-            $criteria->addSelectColumn(ProductVersionTableMap::PRICE2);
-            $criteria->addSelectColumn(ProductVersionTableMap::ECOTAX);
-            $criteria->addSelectColumn(ProductVersionTableMap::NEWNESS);
-            $criteria->addSelectColumn(ProductVersionTableMap::PROMO);
-            $criteria->addSelectColumn(ProductVersionTableMap::QUANTITY);
             $criteria->addSelectColumn(ProductVersionTableMap::VISIBLE);
-            $criteria->addSelectColumn(ProductVersionTableMap::WEIGHT);
             $criteria->addSelectColumn(ProductVersionTableMap::POSITION);
             $criteria->addSelectColumn(ProductVersionTableMap::CREATED_AT);
             $criteria->addSelectColumn(ProductVersionTableMap::UPDATED_AT);
@@ -440,14 +391,7 @@ class ProductVersionTableMap extends TableMap
             $criteria->addSelectColumn($alias . '.ID');
             $criteria->addSelectColumn($alias . '.TAX_RULE_ID');
             $criteria->addSelectColumn($alias . '.REF');
-            $criteria->addSelectColumn($alias . '.PRICE');
-            $criteria->addSelectColumn($alias . '.PRICE2');
-            $criteria->addSelectColumn($alias . '.ECOTAX');
-            $criteria->addSelectColumn($alias . '.NEWNESS');
-            $criteria->addSelectColumn($alias . '.PROMO');
-            $criteria->addSelectColumn($alias . '.QUANTITY');
             $criteria->addSelectColumn($alias . '.VISIBLE');
-            $criteria->addSelectColumn($alias . '.WEIGHT');
             $criteria->addSelectColumn($alias . '.POSITION');
             $criteria->addSelectColumn($alias . '.CREATED_AT');
             $criteria->addSelectColumn($alias . '.UPDATED_AT');

core/lib/Thelia/Model/Map/StockTableMap.php

@@ -57,7 +57,7 @@ class StockTableMap extends TableMap
     /**
      * The total number of columns
      */
-    const NUM_COLUMNS = 7;
+    const NUM_COLUMNS = 9;
 
     /**
      * The number of lazy-loaded columns
@@ -67,18 +67,13 @@ class StockTableMap extends TableMap
     /**
      * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
      */
-    const NUM_HYDRATE_COLUMNS = 7;
+    const NUM_HYDRATE_COLUMNS = 9;
 
     /**
      * the column name for the ID field
      */
     const ID = 'stock.ID';
 
-    /**
-     * the column name for the COMBINATION_ID field
-     */
-    const COMBINATION_ID = 'stock.COMBINATION_ID';
-
     /**
      * the column name for the PRODUCT_ID field
      */
@@ -94,6 +89,21 @@ class StockTableMap extends TableMap
      */
     const QUANTITY = 'stock.QUANTITY';
 
+    /**
+     * the column name for the PROMO field
+     */
+    const PROMO = 'stock.PROMO';
+
+    /**
+     * the column name for the NEWNESS field
+     */
+    const NEWNESS = 'stock.NEWNESS';
+
+    /**
+     * the column name for the WEIGHT field
+     */
+    const WEIGHT = 'stock.WEIGHT';
+
     /**
      * the column name for the CREATED_AT field
      */
@@ -116,12 +126,12 @@ class StockTableMap extends TableMap
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'CombinationId', 'ProductId', 'Increase', 'Quantity', 'CreatedAt', 'UpdatedAt', ),
+        self::TYPE_PHPNAME       => array('Id', 'ProductId', 'Increase', 'Quantity', 'Promo', 'Newness', 'Weight', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'combinationId', 'productId', 'increase', 'quantity', 'createdAt', 'updatedAt', ),
+        self::TYPE_STUDLYPHPNAME => array('id', 'productId', 'increase', 'quantity', 'promo', 'newness', 'weight', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(StockTableMap::ID, StockTableMap::COMBINATION_ID, StockTableMap::PRODUCT_ID, StockTableMap::INCREASE, StockTableMap::QUANTITY, StockTableMap::CREATED_AT, StockTableMap::UPDATED_AT, ),
+        self::TYPE_COLNAME       => array(StockTableMap::ID, StockTableMap::PRODUCT_ID, StockTableMap::INCREASE, StockTableMap::QUANTITY, StockTableMap::PROMO, StockTableMap::NEWNESS, StockTableMap::WEIGHT, StockTableMap::CREATED_AT, StockTableMap::UPDATED_AT, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'COMBINATION_ID', 'PRODUCT_ID', 'INCREASE', 'QUANTITY', 'CREATED_AT', 'UPDATED_AT', ),
+        self::TYPE_RAW_COLNAME   => array('ID', 'PRODUCT_ID', 'INCREASE', 'QUANTITY', 'PROMO', 'NEWNESS', 'WEIGHT', 'CREATED_AT', 'UPDATED_AT', ),
-        self::TYPE_FIELDNAME     => array('id', 'combination_id', 'product_id', 'increase', 'quantity', 'created_at', 'updated_at', ),
+        self::TYPE_FIELDNAME     => array('id', 'product_id', 'increase', 'quantity', 'promo', 'newness', 'weight', 'created_at', 'updated_at', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, )
     );
 
     /**
@@ -131,12 +141,12 @@ class StockTableMap extends TableMap
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
     protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'CombinationId' => 1, 'ProductId' => 2, 'Increase' => 3, 'Quantity' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ),
+        self::TYPE_PHPNAME       => array('Id' => 0, 'ProductId' => 1, 'Increase' => 2, 'Quantity' => 3, 'Promo' => 4, 'Newness' => 5, 'Weight' => 6, 'CreatedAt' => 7, 'UpdatedAt' => 8, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'combinationId' => 1, 'productId' => 2, 'increase' => 3, 'quantity' => 4, 'createdAt' => 5, 'updatedAt' => 6, ),
+        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'productId' => 1, 'increase' => 2, 'quantity' => 3, 'promo' => 4, 'newness' => 5, 'weight' => 6, 'createdAt' => 7, 'updatedAt' => 8, ),
-        self::TYPE_COLNAME       => array(StockTableMap::ID => 0, StockTableMap::COMBINATION_ID => 1, StockTableMap::PRODUCT_ID => 2, StockTableMap::INCREASE => 3, StockTableMap::QUANTITY => 4, StockTableMap::CREATED_AT => 5, StockTableMap::UPDATED_AT => 6, ),
+        self::TYPE_COLNAME       => array(StockTableMap::ID => 0, StockTableMap::PRODUCT_ID => 1, StockTableMap::INCREASE => 2, StockTableMap::QUANTITY => 3, StockTableMap::PROMO => 4, StockTableMap::NEWNESS => 5, StockTableMap::WEIGHT => 6, StockTableMap::CREATED_AT => 7, StockTableMap::UPDATED_AT => 8, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'COMBINATION_ID' => 1, 'PRODUCT_ID' => 2, 'INCREASE' => 3, 'QUANTITY' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ),
+        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'PRODUCT_ID' => 1, 'INCREASE' => 2, 'QUANTITY' => 3, 'PROMO' => 4, 'NEWNESS' => 5, 'WEIGHT' => 6, 'CREATED_AT' => 7, 'UPDATED_AT' => 8, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'combination_id' => 1, 'product_id' => 2, 'increase' => 3, 'quantity' => 4, 'created_at' => 5, 'updated_at' => 6, ),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'product_id' => 1, 'increase' => 2, 'quantity' => 3, 'promo' => 4, 'newness' => 5, 'weight' => 6, 'created_at' => 7, 'updated_at' => 8, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, )
     );
 
     /**
@@ -156,10 +166,12 @@ class StockTableMap extends TableMap
         $this->setUseIdGenerator(true);
         // columns
         $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
-        $this->addForeignKey('COMBINATION_ID', 'CombinationId', 'INTEGER', 'combination', 'ID', false, null, null);
         $this->addForeignKey('PRODUCT_ID', 'ProductId', 'INTEGER', 'product', 'ID', true, null, null);
         $this->addColumn('INCREASE', 'Increase', 'FLOAT', false, null, null);
         $this->addColumn('QUANTITY', 'Quantity', 'FLOAT', true, null, null);
+        $this->addColumn('PROMO', 'Promo', 'TINYINT', false, null, 0);
+        $this->addColumn('NEWNESS', 'Newness', 'TINYINT', false, null, 0);
+        $this->addColumn('WEIGHT', 'Weight', 'FLOAT', false, null, null);
         $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
         $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
     } // initialize()
@@ -169,8 +181,10 @@ class StockTableMap extends TableMap
      */
     public function buildRelations()
     {
-        $this->addRelation('Combination', '\\Thelia\\Model\\Combination', RelationMap::MANY_TO_ONE, array('combination_id' => 'id', ), 'SET NULL', 'RESTRICT');
         $this->addRelation('Product', '\\Thelia\\Model\\Product', RelationMap::MANY_TO_ONE, array('product_id' => 'id', ), 'CASCADE', 'RESTRICT');
+        $this->addRelation('AttributeCombination', '\\Thelia\\Model\\AttributeCombination', RelationMap::ONE_TO_MANY, array('id' => 'stock_id', ), null, null, 'AttributeCombinations');
+        $this->addRelation('CartItem', '\\Thelia\\Model\\CartItem', RelationMap::ONE_TO_MANY, array('id' => 'stock_id', ), null, null, 'CartItems');
+        $this->addRelation('ProductPrice', '\\Thelia\\Model\\ProductPrice', RelationMap::ONE_TO_MANY, array('id' => 'stock_id', ), null, null, 'ProductPrices');
     } // buildRelations()
 
     /**
@@ -325,18 +339,22 @@ class StockTableMap extends TableMap
     {
         if (null === $alias) {
             $criteria->addSelectColumn(StockTableMap::ID);
-            $criteria->addSelectColumn(StockTableMap::COMBINATION_ID);
             $criteria->addSelectColumn(StockTableMap::PRODUCT_ID);
             $criteria->addSelectColumn(StockTableMap::INCREASE);
             $criteria->addSelectColumn(StockTableMap::QUANTITY);
+            $criteria->addSelectColumn(StockTableMap::PROMO);
+            $criteria->addSelectColumn(StockTableMap::NEWNESS);
+            $criteria->addSelectColumn(StockTableMap::WEIGHT);
             $criteria->addSelectColumn(StockTableMap::CREATED_AT);
             $criteria->addSelectColumn(StockTableMap::UPDATED_AT);
         } else {
             $criteria->addSelectColumn($alias . '.ID');
-            $criteria->addSelectColumn($alias . '.COMBINATION_ID');
             $criteria->addSelectColumn($alias . '.PRODUCT_ID');
             $criteria->addSelectColumn($alias . '.INCREASE');
             $criteria->addSelectColumn($alias . '.QUANTITY');
+            $criteria->addSelectColumn($alias . '.PROMO');
+            $criteria->addSelectColumn($alias . '.NEWNESS');
+            $criteria->addSelectColumn($alias . '.WEIGHT');
             $criteria->addSelectColumn($alias . '.CREATED_AT');
             $criteria->addSelectColumn($alias . '.UPDATED_AT');
         }

core/lib/Thelia/Model/ProductPrice.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Thelia\Model;
+
+use Thelia\Model\Base\ProductPrice as BaseProductPrice;
+
+        class ProductPrice extends BaseProductPrice
+{
+
+}

core/lib/Thelia/Model/ProductPriceQuery.php

@@ -2,11 +2,11 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base\FeatureProdQuery as BaseFeatureProdQuery;
+use Thelia\Model\Base\ProductPriceQuery as BaseProductPriceQuery;
 
 
 /**
- * Skeleton subclass for performing query and update operations on the 'feature_prod' table.
+ * Skeleton subclass for performing query and update operations on the 'product_price' table.
  *
  *
  *
@@ -15,6 +15,7 @@ use Thelia\Model\Base\FeatureProdQuery as BaseFeatureProdQuery;
  * long as it does not already exist in the output directory.
  *
  */
-class FeatureProdQuery extends BaseFeatureProdQuery {
+class ProductPriceQuery extends BaseProductPriceQuery
+{
 
-} // FeatureProdQuery
+} // ProductPriceQuery

install/insert.sql

@@ -287,3 +287,797 @@ INSERT INTO `country` (`id`, `area_id`, `isocode`, `isoalpha2`, `isoalpha3`, `cr
 (266, NULL, '258', 'PF', 'PYF', NOW(), NOW()),
 (267, NULL, '876', 'WF', 'WLF', NOW(), NOW()),
 (268, NULL, '840', 'US', 'USA', NOW(), NOW());
+
+INSERT INTO `country_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES
+(1, 'en_US', 'Afghanistan', '', '', ''),
+(1, 'es_ES', 'Afganistán', '', '', ''),
+(1, 'fr_FR', 'Afghanistan', '', '', ''),
+(2, 'en_US', 'South Africa', '', '', ''),
+(2, 'es_ES', 'Sudáfrica', '', '', ''),
+(2, 'fr_FR', 'Afrique du Sud', '', '', ''),
+(3, 'en_US', 'Albania', '', '', ''),
+(3, 'es_ES', 'Albania', '', '', ''),
+(3, 'fr_FR', 'Albanie', '', '', ''),
+(4, 'en_US', 'Algeria', '', '', ''),
+(4, 'es_ES', 'Argelia', '', '', ''),
+(4, 'fr_FR', 'Algérie', '', '', ''),
+(5, 'en_US', 'Germany', '', '', ''),
+(5, 'es_ES', 'Alemania', '', '', ''),
+(5, 'fr_FR', 'Allemagne', '', '', ''),
+(6, 'en_US', 'Andorra', '', '', ''),
+(6, 'es_ES', 'Andorra', '', '', ''),
+(6, 'fr_FR', 'Andorre', '', '', ''),
+(7, 'en_US', 'Angola', '', '', ''),
+(7, 'es_ES', 'Angola', '', '', ''),
+(7, 'fr_FR', 'Angola', '', '', ''),
+(8, 'en_US', 'Antigua and Barbuda', '', '', ''),
+(8, 'es_ES', 'Antigua y Barbuda', '', '', ''),
+(8, 'fr_FR', 'Antigua-et-Barbuda', '', '', ''),
+(9, 'en_US', 'Saudi Arabia', '', '', ''),
+(9, 'es_ES', 'Arabia Saudita', '', '', ''),
+(9, 'fr_FR', 'Arabie saoudite', '', '', ''),
+(10, 'en_US', 'Argentina', '', '', ''),
+(10, 'es_ES', 'Argentina', '', '', ''),
+(10, 'fr_FR', 'Argentine', '', '', ''),
+(11, 'en_US', 'Armenia', '', '', ''),
+(11, 'es_ES', 'Armenia', '', '', ''),
+(11, 'fr_FR', 'Arménie', '', '', ''),
+(12, 'en_US', 'Australia', '', '', ''),
+(12, 'es_ES', 'Australia', '', '', ''),
+(12, 'fr_FR', 'Australie', '', '', ''),
+(13, 'en_US', 'Austria', '', '', ''),
+(13, 'es_ES', 'Austria', '', '', ''),
+(13, 'fr_FR', 'Autriche', '', '', ''),
+(14, 'en_US', 'Azerbaijan', '', '', ''),
+(14, 'es_ES', 'Azerbaiyán', '', '', ''),
+(14, 'fr_FR', 'Azerbaïdjan', '', '', ''),
+(15, 'en_US', 'Bahamas', '', '', ''),
+(15, 'es_ES', 'Bahamas', '', '', ''),
+(15, 'fr_FR', 'Bahamas', '', '', ''),
+(16, 'en_US', 'Bahrain', '', '', ''),
+(16, 'es_ES', 'Bahrein', '', '', ''),
+(16, 'fr_FR', 'Bahreïn', '', '', ''),
+(17, 'en_US', 'Bangladesh', '', '', ''),
+(17, 'es_ES', 'Bangladesh', '', '', ''),
+(17, 'fr_FR', 'Bangladesh', '', '', ''),
+(18, 'en_US', 'Barbados', '', '', ''),
+(18, 'es_ES', 'Barbados', '', '', ''),
+(18, 'fr_FR', 'Barbade', '', '', ''),
+(19, 'en_US', 'Belarus', '', '', ''),
+(19, 'es_ES', 'Belarús', '', '', ''),
+(19, 'fr_FR', 'Belau', '', '', ''),
+(20, 'en_US', 'Belgium', '', '', ''),
+(20, 'es_ES', 'Bélgica', '', '', ''),
+(20, 'fr_FR', 'Belgique', '', '', ''),
+(21, 'en_US', 'Belize', '', '', ''),
+(21, 'es_ES', 'Belice', '', '', ''),
+(21, 'fr_FR', 'Belize', '', '', ''),
+(22, 'en_US', 'Benin', '', '', ''),
+(22, 'es_ES', 'Benin', '', '', ''),
+(22, 'fr_FR', 'Bénin', '', '', ''),
+(23, 'en_US', 'Bhutan', '', '', ''),
+(23, 'es_ES', 'Bhután', '', '', ''),
+(23, 'fr_FR', 'Bhoutan', '', '', ''),
+(24, 'en_US', 'Bielorussia', '', '', ''),
+(24, 'es_ES', 'Bielorusia', '', '', ''),
+(24, 'fr_FR', 'Biélorussie', '', '', ''),
+(25, 'en_US', 'Burma', '', '', ''),
+(25, 'es_ES', 'Birmania', '', '', ''),
+(25, 'fr_FR', 'Birmanie', '', '', ''),
+(26, 'en_US', 'Bolivia', '', '', ''),
+(26, 'es_ES', 'Bolivia', '', '', ''),
+(26, 'fr_FR', 'Bolivie', '', '', ''),
+(27, 'en_US', 'Bosnia and Herzegovina', '', '', ''),
+(27, 'es_ES', 'Bosnia y Herzegovina', '', '', ''),
+(27, 'fr_FR', 'Bosnie-Herzégovine', '', '', ''),
+(28, 'en_US', 'Botswana', '', '', ''),
+(28, 'es_ES', 'Botswana', '', '', ''),
+(28, 'fr_FR', 'Botswana', '', '', ''),
+(29, 'en_US', 'Brazil', '', '', ''),
+(29, 'es_ES', 'Brasil', '', '', ''),
+(29, 'fr_FR', 'Brésil', '', '', ''),
+(30, 'en_US', 'Brunei', '', '', ''),
+(30, 'es_ES', 'Brunei', '', '', ''),
+(30, 'fr_FR', 'Brunei', '', '', ''),
+(31, 'en_US', 'Bulgaria', '', '', ''),
+(31, 'es_ES', 'Bulgaria', '', '', ''),
+(31, 'fr_FR', 'Bulgarie', '', '', ''),
+(32, 'en_US', 'Burkina', '', '', ''),
+(32, 'es_ES', 'Burkina', '', '', ''),
+(32, 'fr_FR', 'Burkina', '', '', ''),
+(33, 'en_US', 'Burundi', '', '', ''),
+(33, 'es_ES', 'Burundi', '', '', ''),
+(33, 'fr_FR', 'Burundi', '', '', ''),
+(34, 'en_US', 'Cambodia', '', '', ''),
+(34, 'es_ES', 'Camboya', '', '', ''),
+(34, 'fr_FR', 'Cambodge', '', '', ''),
+(35, 'en_US', 'Cameroon', '', '', ''),
+(35, 'es_ES', 'Camerún', '', '', ''),
+(35, 'fr_FR', 'Cameroun', '', '', ''),
+(37, 'en_US', 'Cape Verde', '', '', ''),
+(37, 'es_ES', 'Cabo Verde', '', '', ''),
+(37, 'fr_FR', 'Cap-Vert', '', '', ''),
+(38, 'en_US', 'Chile', '', '', ''),
+(38, 'es_ES', 'Chile', '', '', ''),
+(38, 'fr_FR', 'Chili', '', '', ''),
+(39, 'en_US', 'China', '', '', ''),
+(39, 'es_ES', 'China', '', '', ''),
+(39, 'fr_FR', 'Chine', '', '', ''),
+(40, 'en_US', 'Cyprus', '', '', ''),
+(40, 'es_ES', 'Chipre', '', '', ''),
+(40, 'fr_FR', 'Chypre', '', '', ''),
+(41, 'en_US', 'Colombia', '', '', ''),
+(41, 'es_ES', 'Colombia', '', '', ''),
+(41, 'fr_FR', 'Colombie', '', '', ''),
+(42, 'en_US', 'Comoros', '', '', ''),
+(42, 'es_ES', 'Comoras', '', '', ''),
+(42, 'fr_FR', 'Comores', '', '', ''),
+(43, 'en_US', 'Congo', '', '', ''),
+(43, 'es_ES', 'Congo', '', '', ''),
+(43, 'fr_FR', 'Congo', '', '', ''),
+(44, 'en_US', 'Cook Islands', '', '', ''),
+(44, 'es_ES', 'Cook', '', '', ''),
+(44, 'fr_FR', 'Cook', '', '', ''),
+(45, 'en_US', 'North Korea', '', '', ''),
+(45, 'es_ES', 'Corea del Norte', '', '', ''),
+(45, 'fr_FR', 'Corée du Nord', '', '', ''),
+(46, 'en_US', 'South Korea', '', '', ''),
+(46, 'es_ES', 'Corea del Sur', '', '', ''),
+(46, 'fr_FR', 'Corée du Sud', '', '', ''),
+(47, 'en_US', 'Costa Rica', '', '', ''),
+(47, 'es_ES', 'Costa Rica', '', '', ''),
+(47, 'fr_FR', 'Costa Rica', '', '', ''),
+(48, 'en_US', 'Ivory Coast', '', '', ''),
+(48, 'es_ES', 'Costa de Marfil', '', '', ''),
+(48, 'fr_FR', 'Côte dIvoire', '', '', ''),
+(49, 'en_US', 'Croatia', '', '', ''),
+(49, 'es_ES', 'Croacia', '', '', ''),
+(49, 'fr_FR', 'Croatie', '', '', ''),
+(50, 'en_US', 'Cuba', '', '', ''),
+(50, 'es_ES', 'Cuba', '', '', ''),
+(50, 'fr_FR', 'Cuba', '', '', ''),
+(51, 'en_US', 'Denmark', '', '', ''),
+(51, 'es_ES', 'Dinamarca', '', '', ''),
+(51, 'fr_FR', 'Danemark', '', '', ''),
+(52, 'en_US', 'Djibouti', '', '', ''),
+(52, 'es_ES', 'Djibouti', '', '', ''),
+(52, 'fr_FR', 'Djibouti', '', '', ''),
+(53, 'en_US', 'Dominica', '', '', ''),
+(53, 'es_ES', 'Dominica', '', '', ''),
+(53, 'fr_FR', 'Dominique', '', '', ''),
+(54, 'en_US', 'Egypt', '', '', ''),
+(54, 'es_ES', 'Egipto', '', '', ''),
+(54, 'fr_FR', 'Égypte', '', '', ''),
+(55, 'en_US', 'United Arab Emirates', '', '', ''),
+(55, 'es_ES', 'Emiratos Árabes Unidos', '', '', ''),
+(55, 'fr_FR', 'Émirats arabes unis', '', '', ''),
+(56, 'en_US', 'Ecuador', '', '', ''),
+(56, 'es_ES', 'Ecuador', '', '', ''),
+(56, 'fr_FR', 'Équateur', '', '', ''),
+(57, 'en_US', 'Eritrea', '', '', ''),
+(57, 'es_ES', 'Eritrea', '', '', ''),
+(57, 'fr_FR', 'Érythrée', '', '', ''),
+(58, 'en_US', 'Spain', '', '', ''),
+(58, 'es_ES', 'España', '', '', ''),
+(58, 'fr_FR', 'Espagne', '', '', ''),
+(59, 'en_US', 'Estonia', '', '', ''),
+(59, 'es_ES', 'Estonia', '', '', ''),
+(59, 'fr_FR', 'Estonie', '', '', ''),
+(61, 'en_US', 'Ethiopia', '', '', ''),
+(61, 'es_ES', 'Etiopía', '', '', ''),
+(61, 'fr_FR', 'Éthiopie', '', '', ''),
+(62, 'en_US', 'Fiji', '', '', ''),
+(62, 'es_ES', 'Fiji', '', '', ''),
+(62, 'fr_FR', 'Fidji', '', '', ''),
+(63, 'en_US', 'Finland', '', '', ''),
+(63, 'es_ES', 'Finlandia', '', '', ''),
+(63, 'fr_FR', 'Finlande', '', '', ''),
+(64, 'en_US', 'France metropolitan', '', '', ''),
+(64, 'es_ES', 'Francia', '', '', ''),
+(64, 'fr_FR', 'France métropolitaine', '', '', ''),
+(65, 'en_US', 'Gabon', '', '', ''),
+(65, 'es_ES', 'Gabón', '', '', ''),
+(65, 'fr_FR', 'Gabon', '', '', ''),
+(66, 'en_US', 'Gambia', '', '', ''),
+(66, 'es_ES', 'Gambia', '', '', ''),
+(66, 'fr_FR', 'Gambie', '', '', ''),
+(67, 'en_US', 'Georgia', '', '', ''),
+(67, 'es_ES', 'Georgia', '', '', ''),
+(67, 'fr_FR', 'Géorgie', '', '', ''),
+(68, 'en_US', 'Ghana', '', '', ''),
+(68, 'es_ES', 'Ghana', '', '', ''),
+(68, 'fr_FR', 'Ghana', '', '', ''),
+(69, 'en_US', 'Greece', '', '', ''),
+(69, 'es_ES', 'Grecia', '', '', ''),
+(69, 'fr_FR', 'Grèce', '', '', ''),
+(70, 'en_US', 'Grenada', '', '', ''),
+(70, 'es_ES', 'Granada', '', '', ''),
+(70, 'fr_FR', 'Grenade', '', '', ''),
+(71, 'en_US', 'Guatemala', '', '', ''),
+(71, 'es_ES', 'Guatemala', '', '', ''),
+(71, 'fr_FR', 'Guatemala', '', '', ''),
+(72, 'en_US', 'Guinea', '', '', ''),
+(72, 'es_ES', 'Guinea', '', '', ''),
+(72, 'fr_FR', 'Guinée', '', '', ''),
+(73, 'en_US', 'Guinea-Bissau', '', '', ''),
+(73, 'es_ES', 'Guinea-Bissau', '', '', ''),
+(73, 'fr_FR', 'Guinée-Bissao', '', '', ''),
+(74, 'en_US', 'Equatorial Guinea', '', '', ''),
+(74, 'es_ES', 'Guinea Ecuatorial', '', '', ''),
+(74, 'fr_FR', 'Guinée équatoriale', '', '', ''),
+(75, 'en_US', 'Guyana', '', '', ''),
+(75, 'es_ES', 'Guyana', '', '', ''),
+(75, 'fr_FR', 'Guyana', '', '', ''),
+(76, 'en_US', 'Haiti', '', '', ''),
+(76, 'es_ES', 'Haití', '', '', ''),
+(76, 'fr_FR', 'Haïti', '', '', ''),
+(77, 'en_US', 'Honduras', '', '', ''),
+(77, 'es_ES', 'Honduras', '', '', ''),
+(77, 'fr_FR', 'Honduras', '', '', ''),
+(78, 'en_US', 'Hungary', '', '', ''),
+(78, 'es_ES', 'Hungría', '', '', ''),
+(78, 'fr_FR', 'Hongrie', '', '', ''),
+(79, 'en_US', 'India', '', '', ''),
+(79, 'es_ES', 'India', '', '', ''),
+(79, 'fr_FR', 'Inde', '', '', ''),
+(80, 'en_US', 'Indonesia', '', '', ''),
+(80, 'es_ES', 'Indonesia', '', '', ''),
+(80, 'fr_FR', 'Indonésie', '', '', ''),
+(81, 'en_US', 'Iran', '', '', ''),
+(81, 'es_ES', 'Irán', '', '', ''),
+(81, 'fr_FR', 'Iran', '', '', ''),
+(82, 'en_US', 'Iraq', '', '', ''),
+(82, 'es_ES', 'Iraq', '', '', ''),
+(82, 'fr_FR', 'Iraq', '', '', ''),
+(83, 'en_US', 'Ireland', '', '', ''),
+(83, 'es_ES', 'Irlanda', '', '', ''),
+(83, 'fr_FR', 'Irlande', '', '', ''),
+(84, 'en_US', 'Iceland', '', '', ''),
+(84, 'es_ES', 'Islandia', '', '', ''),
+(84, 'fr_FR', 'Islande', '', '', ''),
+(85, 'en_US', 'Israel', '', '', ''),
+(85, 'es_ES', 'Israel', '', '', ''),
+(85, 'fr_FR', 'Israël', '', '', ''),
+(86, 'en_US', 'Italy', '', '', ''),
+(86, 'es_ES', 'Italia', '', '', ''),
+(86, 'fr_FR', 'Italie', '', '', ''),
+(87, 'en_US', 'Jamaica', '', '', ''),
+(87, 'es_ES', 'Jamaica', '', '', ''),
+(87, 'fr_FR', 'Jamaïque', '', '', ''),
+(88, 'en_US', 'Japan', '', '', ''),
+(88, 'es_ES', 'Japón', '', '', ''),
+(88, 'fr_FR', 'Japon', '', '', ''),
+(89, 'en_US', 'Jordan', '', '', ''),
+(89, 'es_ES', 'Jordania', '', '', ''),
+(89, 'fr_FR', 'Jordanie', '', '', ''),
+(90, 'en_US', 'Kazakhstan', '', '', ''),
+(90, 'es_ES', 'Kazajstán', '', '', ''),
+(90, 'fr_FR', 'Kazakhstan', '', '', ''),
+(91, 'en_US', 'Kenya', '', '', ''),
+(91, 'es_ES', 'Kenia', '', '', ''),
+(91, 'fr_FR', 'Kenya', '', '', ''),
+(92, 'en_US', 'Kyrgyzstan', '', '', ''),
+(92, 'es_ES', 'Kirguistán', '', '', ''),
+(92, 'fr_FR', 'Kirghizistan', '', '', ''),
+(93, 'en_US', 'Kiribati', '', '', ''),
+(93, 'es_ES', 'Kiribati', '', '', ''),
+(93, 'fr_FR', 'Kiribati', '', '', ''),
+(94, 'en_US', 'Kuwait', '', '', ''),
+(94, 'es_ES', 'Kuwait', '', '', ''),
+(94, 'fr_FR', 'Koweït', '', '', ''),
+(95, 'en_US', 'Laos', '', '', ''),
+(95, 'es_ES', 'Laos', '', '', ''),
+(95, 'fr_FR', 'Laos', '', '', ''),
+(96, 'en_US', 'Lesotho', '', '', ''),
+(96, 'es_ES', 'Lesotho', '', '', ''),
+(96, 'fr_FR', 'Lesotho', '', '', ''),
+(97, 'en_US', 'Latvia', '', '', ''),
+(97, 'es_ES', 'Letonia', '', '', ''),
+(97, 'fr_FR', 'Lettonie', '', '', ''),
+(98, 'en_US', 'Lebanon', '', '', ''),
+(98, 'es_ES', 'Líbano', '', '', ''),
+(98, 'fr_FR', 'Liban', '', '', ''),
+(99, 'en_US', 'Liberia', '', '', ''),
+(99, 'es_ES', 'Liberia', '', '', ''),
+(99, 'fr_FR', 'Liberia', '', '', ''),
+(100, 'en_US', 'Libya', '', '', ''),
+(100, 'es_ES', 'Libia', '', '', ''),
+(100, 'fr_FR', 'Libye', '', '', ''),
+(101, 'en_US', 'Liechtenstein', '', '', ''),
+(101, 'es_ES', 'Liechtenstein', '', '', ''),
+(101, 'fr_FR', 'Liechtenstein', '', '', ''),
+(102, 'en_US', 'Lithuania', '', '', ''),
+(102, 'es_ES', 'Lituania', '', '', ''),
+(102, 'fr_FR', 'Lituanie', '', '', ''),
+(103, 'en_US', 'Luxembourg', '', '', ''),
+(103, 'es_ES', 'Luxemburgo', '', '', ''),
+(103, 'fr_FR', 'Luxembourg', '', '', ''),
+(104, 'en_US', 'Macedonia', '', '', ''),
+(104, 'es_ES', 'Macedonia', '', '', ''),
+(104, 'fr_FR', 'Macédoine', '', '', ''),
+(105, 'en_US', 'Madagascar', '', '', ''),
+(105, 'es_ES', 'Madagascar', '', '', ''),
+(105, 'fr_FR', 'Madagascar', '', '', ''),
+(106, 'en_US', 'Malaysia', '', '', ''),
+(106, 'es_ES', 'Malasia', '', '', ''),
+(106, 'fr_FR', 'Malaisie', '', '', ''),
+(107, 'en_US', 'Malawi', '', '', ''),
+(107, 'es_ES', 'Malawi', '', '', ''),
+(107, 'fr_FR', 'Malawi', '', '', ''),
+(108, 'en_US', 'Maldives', '', '', ''),
+(108, 'es_ES', 'Maldivas', '', '', ''),
+(108, 'fr_FR', 'Maldives', '', '', ''),
+(109, 'en_US', 'Mali', '', '', ''),
+(109, 'es_ES', 'Malí', '', '', ''),
+(109, 'fr_FR', 'Mali', '', '', ''),
+(110, 'en_US', 'Malta', '', '', ''),
+(110, 'es_ES', 'Malta', '', '', ''),
+(110, 'fr_FR', 'Malte', '', '', ''),
+(111, 'en_US', 'Morocco', '', '', ''),
+(111, 'es_ES', 'Marruecos', '', '', ''),
+(111, 'fr_FR', 'Maroc', '', '', ''),
+(112, 'en_US', 'Marshall Islands', '', '', ''),
+(112, 'es_ES', 'Marshall', '', '', ''),
+(112, 'fr_FR', 'Marshall', '', '', ''),
+(113, 'en_US', 'Mauritius', '', '', ''),
+(113, 'es_ES', 'Mauricio', '', '', ''),
+(113, 'fr_FR', 'Maurice', '', '', ''),
+(114, 'en_US', 'Mauritania', '', '', ''),
+(114, 'es_ES', 'Mauritania', '', '', ''),
+(114, 'fr_FR', 'Mauritanie', '', '', ''),
+(115, 'en_US', 'Mexico', '', '', ''),
+(115, 'es_ES', 'Méjico', '', '', ''),
+(115, 'fr_FR', 'Mexique', '', '', ''),
+(116, 'en_US', 'Micronesia', '', '', ''),
+(116, 'es_ES', 'Micronesia', '', '', ''),
+(116, 'fr_FR', 'Micronésie', '', '', ''),
+(117, 'en_US', 'Moldova', '', '', ''),
+(117, 'es_ES', 'Moldova', '', '', ''),
+(117, 'fr_FR', 'Moldavie', '', '', ''),
+(118, 'en_US', 'Monaco', '', '', ''),
+(118, 'es_ES', 'Mónaco', '', '', ''),
+(118, 'fr_FR', 'Monaco', '', '', ''),
+(119, 'en_US', 'Mongolia', '', '', ''),
+(119, 'es_ES', 'Mongolia', '', '', ''),
+(119, 'fr_FR', 'Mongolie', '', '', ''),
+(120, 'en_US', 'Mozambique', '', '', ''),
+(120, 'es_ES', 'Mozambique', '', '', ''),
+(120, 'fr_FR', 'Mozambique', '', '', ''),
+(121, 'en_US', 'Namibia', '', '', ''),
+(121, 'es_ES', 'Namibia', '', '', ''),
+(121, 'fr_FR', 'Namibie', '', '', ''),
+(122, 'en_US', 'Nauru', '', '', ''),
+(122, 'es_ES', 'Nauru', '', '', ''),
+(122, 'fr_FR', 'Nauru', '', '', ''),
+(123, 'en_US', 'Nepal', '', '', ''),
+(123, 'es_ES', 'Nepal', '', '', ''),
+(123, 'fr_FR', 'Népal', '', '', ''),
+(124, 'en_US', 'Nicaragua', '', '', ''),
+(124, 'es_ES', 'Nicaragua', '', '', ''),
+(124, 'fr_FR', 'Nicaragua', '', '', ''),
+(125, 'en_US', 'Niger', '', '', ''),
+(125, 'es_ES', 'Níger', '', '', ''),
+(125, 'fr_FR', 'Niger', '', '', ''),
+(126, 'en_US', 'Nigeria', '', '', ''),
+(126, 'es_ES', 'Nigeria', '', '', ''),
+(126, 'fr_FR', 'Nigeria', '', '', ''),
+(127, 'en_US', 'Niue', '', '', ''),
+(127, 'es_ES', 'Niue', '', '', ''),
+(127, 'fr_FR', 'Niue', '', '', ''),
+(128, 'en_US', 'Norway', '', '', ''),
+(128, 'es_ES', 'Noruega', '', '', ''),
+(128, 'fr_FR', 'Norvège', '', '', ''),
+(129, 'en_US', 'New Zealand', '', '', ''),
+(129, 'es_ES', 'Nueva Zelandia', '', '', ''),
+(129, 'fr_FR', 'Nouvelle-Zélande', '', '', ''),
+(130, 'en_US', 'Oman', '', '', ''),
+(130, 'es_ES', 'Omán', '', '', ''),
+(130, 'fr_FR', 'Oman', '', '', ''),
+(131, 'en_US', 'Uganda', '', '', ''),
+(131, 'es_ES', 'Uganda', '', '', ''),
+(131, 'fr_FR', 'Ouganda', '', '', ''),
+(132, 'en_US', 'Uzbekistan', '', '', ''),
+(132, 'es_ES', 'Uzbekistán', '', '', ''),
+(132, 'fr_FR', 'Ouzbékistan', '', '', ''),
+(133, 'en_US', 'Pakistan', '', '', ''),
+(133, 'es_ES', 'Pakistán', '', '', ''),
+(133, 'fr_FR', 'Pakistan', '', '', ''),
+(134, 'en_US', 'Panama', '', '', ''),
+(134, 'es_ES', 'Panamá', '', '', ''),
+(134, 'fr_FR', 'Panama', '', '', ''),
+(135, 'en_US', 'Papua Nueva Guinea', '', '', ''),
+(135, 'es_ES', 'Papua Nueva Guinea', '', '', ''),
+(135, 'fr_FR', 'Papouasie', '', '', ''),
+(136, 'en_US', 'Paraguay', '', '', ''),
+(136, 'es_ES', 'Paraguay', '', '', ''),
+(136, 'fr_FR', 'Paraguay', '', '', ''),
+(137, 'en_US', 'Netherlands', '', '', ''),
+(137, 'es_ES', 'Países Bajos', '', '', ''),
+(137, 'fr_FR', 'Pays-Bas', '', '', ''),
+(138, 'en_US', 'Peru', '', '', ''),
+(138, 'es_ES', 'Perú', '', '', ''),
+(138, 'fr_FR', 'Pérou', '', '', ''),
+(139, 'en_US', 'Philippines', '', '', ''),
+(139, 'es_ES', 'Filipinas', '', '', ''),
+(139, 'fr_FR', 'Philippines', '', '', ''),
+(140, 'en_US', 'Poland', '', '', ''),
+(140, 'es_ES', 'Polonia', '', '', ''),
+(140, 'fr_FR', 'Pologne', '', '', ''),
+(141, 'en_US', 'Portugal', '', '', ''),
+(141, 'es_ES', 'Portugal', '', '', ''),
+(141, 'fr_FR', 'Portugal', '', '', ''),
+(142, 'en_US', 'Qatar', '', '', ''),
+(142, 'es_ES', 'Qatar', '', '', ''),
+(142, 'fr_FR', 'Qatar', '', '', ''),
+(143, 'en_US', 'Central African Republic', '', '', ''),
+(143, 'es_ES', 'República Centroafricana', '', '', ''),
+(143, 'fr_FR', 'République centrafricaine', '', '', ''),
+(144, 'en_US', 'Dominican Republic', '', '', ''),
+(144, 'es_ES', 'República Dominicana', '', '', ''),
+(144, 'fr_FR', 'République dominicaine', '', '', ''),
+(145, 'en_US', 'Czech Republic', '', '', ''),
+(145, 'es_ES', 'República Checa', '', '', ''),
+(145, 'fr_FR', 'République tchèque', '', '', ''),
+(146, 'en_US', 'Romania', '', '', ''),
+(146, 'es_ES', 'Rumania', '', '', ''),
+(146, 'fr_FR', 'Roumanie', '', '', ''),
+(147, 'en_US', 'United Kingdom', '', '', ''),
+(147, 'es_ES', 'Reino Unido', '', '', ''),
+(147, 'fr_FR', 'Royaume-Uni', '', '', ''),
+(148, 'en_US', 'Russia', '', '', ''),
+(148, 'es_ES', 'Rusia', '', '', ''),
+(148, 'fr_FR', 'Russie', '', '', ''),
+(149, 'en_US', 'Rwanda', '', '', ''),
+(149, 'es_ES', 'Ruanda', '', '', ''),
+(149, 'fr_FR', 'Rwanda', '', '', ''),
+(150, 'en_US', 'Saint Kitts and Nevis', '', '', ''),
+(150, 'es_ES', 'San Cristóbal', '', '', ''),
+(150, 'fr_FR', 'Saint-Christophe-et-Niévès', '', '', ''),
+(151, 'en_US', 'Saint Lucia', '', '', ''),
+(151, 'es_ES', 'Santa Lucía', '', '', ''),
+(151, 'fr_FR', 'Sainte-Lucie', '', '', ''),
+(152, 'en_US', 'San Marino', '', '', ''),
+(152, 'es_ES', 'San Marino', '', '', ''),
+(152, 'fr_FR', 'Saint-Marin', '', '', ''),
+(153, 'en_US', 'Saint Vincent and the Grenadines', '', '', ''),
+(153, 'es_ES', 'San Vicente y las Granadinas', '', '', ''),
+(153, 'fr_FR', 'Saint-Vincent-et-les Grenadines', '', '', ''),
+(154, 'en_US', 'Solomon Islands', '', '', ''),
+(154, 'es_ES', 'Salomón', '', '', ''),
+(154, 'fr_FR', 'Salomon', '', '', ''),
+(155, 'en_US', 'El Salvador', '', '', ''),
+(155, 'es_ES', 'El Salvador', '', '', ''),
+(155, 'fr_FR', 'Salvador', '', '', ''),
+(156, 'en_US', 'Western Samoa', '', '', ''),
+(156, 'es_ES', 'Samoa', '', '', ''),
+(156, 'fr_FR', 'Samoa occidentales', '', '', ''),
+(157, 'en_US', 'Sao Tome and Principe', '', '', ''),
+(157, 'es_ES', 'Santo Tomé y Príncipe', '', '', ''),
+(157, 'fr_FR', 'Sao Tomé-et-Principe', '', '', ''),
+(158, 'en_US', 'Senegal', '', '', ''),
+(158, 'es_ES', 'Senegal', '', '', ''),
+(158, 'fr_FR', 'Sénégal', '', '', ''),
+(159, 'en_US', 'Seychelles', '', '', ''),
+(159, 'es_ES', 'Seychelles', '', '', ''),
+(159, 'fr_FR', 'Seychelles', '', '', ''),
+(160, 'en_US', 'Sierra Leone', '', '', ''),
+(160, 'es_ES', 'Sierra Leona', '', '', ''),
+(160, 'fr_FR', 'Sierra Leone', '', '', ''),
+(161, 'en_US', 'Singapore', '', '', ''),
+(161, 'es_ES', 'Singapur', '', '', ''),
+(161, 'fr_FR', 'Singapour', '', '', ''),
+(162, 'en_US', 'Slovakia', '', '', ''),
+(162, 'es_ES', 'Eslovaquia', '', '', ''),
+(162, 'fr_FR', 'Slovaquie', '', '', ''),
+(163, 'en_US', 'Slovenia', '', '', ''),
+(163, 'es_ES', 'Eslovenia', '', '', ''),
+(163, 'fr_FR', 'Slovénie', '', '', ''),
+(164, 'en_US', 'Somalia', '', '', ''),
+(164, 'es_ES', 'Somalia', '', '', ''),
+(164, 'fr_FR', 'Somalie', '', '', ''),
+(165, 'en_US', 'Sudan', '', '', ''),
+(165, 'es_ES', 'Sudán', '', '', ''),
+(165, 'fr_FR', 'Soudan', '', '', ''),
+(166, 'en_US', 'Sri Lanka', '', '', ''),
+(166, 'es_ES', 'Sri Lanka', '', '', ''),
+(166, 'fr_FR', 'Sri Lanka', '', '', ''),
+(167, 'en_US', 'Sweden', '', '', ''),
+(167, 'es_ES', 'Suecia', '', '', ''),
+(167, 'fr_FR', 'Suède', '', '', ''),
+(168, 'en_US', 'Switzerland', '', '', ''),
+(168, 'es_ES', 'Suiza', '', '', ''),
+(168, 'fr_FR', 'Suisse', '', '', ''),
+(169, 'en_US', 'Suriname', '', '', ''),
+(169, 'es_ES', 'Suriname', '', '', ''),
+(169, 'fr_FR', 'Suriname', '', '', ''),
+(170, 'en_US', 'Swaziland', '', '', ''),
+(170, 'es_ES', 'Swazilandia', '', '', ''),
+(170, 'fr_FR', 'Swaziland', '', '', ''),
+(171, 'en_US', 'Syria', '', '', ''),
+(171, 'es_ES', 'Siria', '', '', ''),
+(171, 'fr_FR', 'Syrie', '', '', ''),
+(172, 'en_US', 'Tajikistan', '', '', ''),
+(172, 'es_ES', 'Tayikistán', '', '', ''),
+(172, 'fr_FR', 'Tadjikistan', '', '', ''),
+(173, 'en_US', 'Tanzania', '', '', ''),
+(173, 'es_ES', 'Tanzanía', '', '', ''),
+(173, 'fr_FR', 'Tanzanie', '', '', ''),
+(174, 'en_US', 'Chad', '', '', ''),
+(174, 'es_ES', 'Chad', '', '', ''),
+(174, 'fr_FR', 'Tchad', '', '', ''),
+(175, 'en_US', 'Thailand', '', '', ''),
+(175, 'es_ES', 'Tailandia', '', '', ''),
+(175, 'fr_FR', 'Thaïlande', '', '', ''),
+(176, 'en_US', 'Togo', '', '', ''),
+(176, 'es_ES', 'Togo', '', '', ''),
+(176, 'fr_FR', 'Togo', '', '', ''),
+(177, 'en_US', 'Tonga', '', '', ''),
+(177, 'es_ES', 'Tonga', '', '', ''),
+(177, 'fr_FR', 'Tonga', '', '', ''),
+(178, 'en_US', 'Trinidad and Tobago', '', '', ''),
+(178, 'es_ES', 'Trinidad y Tabago', '', '', ''),
+(178, 'fr_FR', 'Trinité-et-Tobago', '', '', ''),
+(179, 'en_US', 'Tunisia', '', '', ''),
+(179, 'es_ES', 'Túnez', '', '', ''),
+(179, 'fr_FR', 'Tunisie', '', '', ''),
+(180, 'en_US', 'Turkmenistan', '', '', ''),
+(180, 'es_ES', 'Turkmenistán', '', '', ''),
+(180, 'fr_FR', 'Turkménistan', '', '', ''),
+(181, 'en_US', 'Turkey', '', '', ''),
+(181, 'es_ES', 'Turquía', '', '', ''),
+(181, 'fr_FR', 'Turquie', '', '', ''),
+(182, 'en_US', 'Tuvalu', '', '', ''),
+(182, 'es_ES', 'Tuvalu', '', '', ''),
+(182, 'fr_FR', 'Tuvalu', '', '', ''),
+(183, 'en_US', 'Ukraine', '', '', ''),
+(183, 'es_ES', 'Ucrania', '', '', ''),
+(183, 'fr_FR', 'Ukraine', '', '', ''),
+(184, 'en_US', 'Uruguay', '', '', ''),
+(184, 'es_ES', 'Uruguay', '', '', ''),
+(184, 'fr_FR', 'Uruguay', '', '', ''),
+(185, 'en_US', 'The Vatican', '', '', ''),
+(185, 'es_ES', 'El Vatican', '', '', ''),
+(185, 'fr_FR', 'Vatican', '', '', ''),
+(186, 'en_US', 'Vanuatu', '', '', ''),
+(186, 'es_ES', 'Vanuatu', '', '', ''),
+(186, 'fr_FR', 'Vanuatu', '', '', ''),
+(187, 'en_US', 'Venezuela', '', '', ''),
+(187, 'es_ES', 'Venezuela', '', '', ''),
+(187, 'fr_FR', 'Venezuela', '', '', ''),
+(188, 'en_US', 'Vietnam', '', '', ''),
+(188, 'es_ES', 'Viet Nam', '', '', ''),
+(188, 'fr_FR', 'Viêt Nam', '', '', ''),
+(189, 'en_US', 'Yemen', '', '', ''),
+(189, 'es_ES', 'Yemen', '', '', ''),
+(189, 'fr_FR', 'Yémen', '', '', ''),
+(190, 'en_US', 'Yougoslavia', '', '', ''),
+(190, 'es_ES', 'Yugoslavia', '', '', ''),
+(190, 'fr_FR', 'Yougoslavie', '', '', ''),
+(191, 'en_US', 'Zaire', '', '', ''),
+(191, 'es_ES', 'Zaire', '', '', ''),
+(191, 'fr_FR', 'Zaïre', '', '', ''),
+(192, 'en_US', 'Zambia', '', '', ''),
+(192, 'es_ES', 'Zambia', '', '', ''),
+(192, 'fr_FR', 'Zambie', '', '', ''),
+(193, 'en_US', 'Zimbabwe', '', '', ''),
+(193, 'es_ES', 'Zimbabwe', '', '', ''),
+(193, 'fr_FR', 'Zimbabwe', '', '', ''),
+(196, 'en_US', 'USA - Alaska', '', '', ''),
+(196, 'es_ES', 'USA - Alaska', '', '', ''),
+(196, 'fr_FR', 'USA - Alaska', '', '', ''),
+(197, 'en_US', 'USA - Arizona', '', '', ''),
+(197, 'es_ES', 'USA - Arizona', '', '', ''),
+(197, 'fr_FR', 'USA - Arizona', '', '', ''),
+(198, 'en_US', 'USA - Arkansas', '', '', ''),
+(198, 'es_ES', 'USA - Arkansas', '', '', ''),
+(198, 'fr_FR', 'USA - Arkansas', '', '', ''),
+(199, 'en_US', 'USA - California', '', '', ''),
+(199, 'es_ES', 'USA - California', '', '', ''),
+(199, 'fr_FR', 'USA - California', '', '', ''),
+(200, 'en_US', 'USA - Colorado', '', '', ''),
+(200, 'es_ES', 'USA - Colorado', '', '', ''),
+(200, 'fr_FR', 'USA - Colorado', '', '', ''),
+(201, 'en_US', 'USA - Connecticut', '', '', ''),
+(201, 'es_ES', 'USA - Connecticut', '', '', ''),
+(201, 'fr_FR', 'USA - Connecticut', '', '', ''),
+(202, 'en_US', 'USA - Delaware', '', '', ''),
+(202, 'es_ES', 'USA - Delaware', '', '', ''),
+(202, 'fr_FR', 'USA - Delaware', '', '', ''),
+(203, 'en_US', 'USA - District Of Columbia', '', '', ''),
+(203, 'es_ES', 'USA - District Of Columbia', '', '', ''),
+(203, 'fr_FR', 'USA - District Of Columbia', '', '', ''),
+(204, 'en_US', 'USA - Florida', '', '', ''),
+(204, 'es_ES', 'USA - Florida', '', '', ''),
+(204, 'fr_FR', 'USA - Florida', '', '', ''),
+(205, 'en_US', 'USA - Georgia', '', '', ''),
+(205, 'es_ES', 'USA - Georgia', '', '', ''),
+(205, 'fr_FR', 'USA - Georgia', '', '', ''),
+(206, 'en_US', 'USA - Hawaii', '', '', ''),
+(206, 'es_ES', 'USA - Hawaii', '', '', ''),
+(206, 'fr_FR', 'USA - Hawaii', '', '', ''),
+(207, 'en_US', 'USA - Idaho', '', '', ''),
+(207, 'es_ES', 'USA - Idaho', '', '', ''),
+(207, 'fr_FR', 'USA - Idaho', '', '', ''),
+(208, 'en_US', 'USA - Illinois', '', '', ''),
+(208, 'es_ES', 'USA - Illinois', '', '', ''),
+(208, 'fr_FR', 'USA - Illinois', '', '', ''),
+(209, 'en_US', 'USA - Indiana', '', '', ''),
+(209, 'es_ES', 'USA - Indiana', '', '', ''),
+(209, 'fr_FR', 'USA - Indiana', '', '', ''),
+(210, 'en_US', 'USA - Iowa', '', '', ''),
+(210, 'es_ES', 'USA - Iowa', '', '', ''),
+(210, 'fr_FR', 'USA - Iowa', '', '', ''),
+(211, 'en_US', 'USA - Kansas', '', '', ''),
+(211, 'es_ES', 'USA - Kansas', '', '', ''),
+(211, 'fr_FR', 'USA - Kansas', '', '', ''),
+(212, 'en_US', 'USA - Kentucky', '', '', ''),
+(212, 'es_ES', 'USA - Kentucky', '', '', ''),
+(212, 'fr_FR', 'USA - Kentucky', '', '', ''),
+(213, 'en_US', 'USA - Louisiana', '', '', ''),
+(213, 'es_ES', 'USA - Louisiana', '', '', ''),
+(213, 'fr_FR', 'USA - Louisiana', '', '', ''),
+(214, 'en_US', 'USA - Maine', '', '', ''),
+(214, 'es_ES', 'USA - Maine', '', '', ''),
+(214, 'fr_FR', 'USA - Maine', '', '', ''),
+(215, 'en_US', 'USA - Maryland', '', '', ''),
+(215, 'es_ES', 'USA - Maryland', '', '', ''),
+(215, 'fr_FR', 'USA - Maryland', '', '', ''),
+(216, 'en_US', 'USA - Massachusetts', '', '', ''),
+(216, 'es_ES', 'USA - Massachusetts', '', '', ''),
+(216, 'fr_FR', 'USA - Massachusetts', '', '', ''),
+(217, 'en_US', 'USA - Michigan', '', '', ''),
+(217, 'es_ES', 'USA - Michigan', '', '', ''),
+(217, 'fr_FR', 'USA - Michigan', '', '', ''),
+(218, 'en_US', 'USA - Minnesota', '', '', ''),
+(218, 'es_ES', 'USA - Minnesota', '', '', ''),
+(218, 'fr_FR', 'USA - Minnesota', '', '', ''),
+(219, 'en_US', 'USA - Mississippi', '', '', ''),
+(219, 'es_ES', 'USA - Mississippi', '', '', ''),
+(219, 'fr_FR', 'USA - Mississippi', '', '', ''),
+(220, 'en_US', 'USA - Missouri', '', '', ''),
+(220, 'es_ES', 'USA - Missouri', '', '', ''),
+(220, 'fr_FR', 'USA - Missouri', '', '', ''),
+(221, 'en_US', 'USA - Montana', '', '', ''),
+(221, 'es_ES', 'USA - Montana', '', '', ''),
+(221, 'fr_FR', 'USA - Montana', '', '', ''),
+(222, 'en_US', 'USA - Nebraska', '', '', ''),
+(222, 'es_ES', 'USA - Nebraska', '', '', ''),
+(222, 'fr_FR', 'USA - Nebraska', '', '', ''),
+(223, 'en_US', 'USA - Nevada', '', '', ''),
+(223, 'es_ES', 'USA - Nevada', '', '', ''),
+(223, 'fr_FR', 'USA - Nevada', '', '', ''),
+(224, 'en_US', 'USA - New Hampshire', '', '', ''),
+(224, 'es_ES', 'USA - New Hampshire', '', '', ''),
+(224, 'fr_FR', 'USA - New Hampshire', '', '', ''),
+(225, 'en_US', 'USA - New Jersey', '', '', ''),
+(225, 'es_ES', 'USA - New Jersey', '', '', ''),
+(225, 'fr_FR', 'USA - New Jersey', '', '', ''),
+(226, 'en_US', 'USA - New Mexico', '', '', ''),
+(226, 'es_ES', 'USA - New Mexico', '', '', ''),
+(226, 'fr_FR', 'USA - New Mexico', '', '', ''),
+(227, 'en_US', 'USA - New York', '', '', ''),
+(227, 'es_ES', 'USA - New York', '', '', ''),
+(227, 'fr_FR', 'USA - New York', '', '', ''),
+(228, 'en_US', 'USA - North Carolina', '', '', ''),
+(228, 'es_ES', 'USA - North Carolina', '', '', ''),
+(228, 'fr_FR', 'USA - North Carolina', '', '', ''),
+(229, 'en_US', 'USA - North Dakota', '', '', ''),
+(229, 'es_ES', 'USA - North Dakota', '', '', ''),
+(229, 'fr_FR', 'USA - North Dakota', '', '', ''),
+(230, 'en_US', 'USA - Ohio', '', '', ''),
+(230, 'es_ES', 'USA - Ohio', '', '', ''),
+(230, 'fr_FR', 'USA - Ohio', '', '', ''),
+(231, 'en_US', 'USA - Oklahoma', '', '', ''),
+(231, 'es_ES', 'USA - Oklahoma', '', '', ''),
+(231, 'fr_FR', 'USA - Oklahoma', '', '', ''),
+(232, 'en_US', 'USA - Oregon', '', '', ''),
+(232, 'es_ES', 'USA - Oregon', '', '', ''),
+(232, 'fr_FR', 'USA - Oregon', '', '', ''),
+(233, 'en_US', 'USA - Pennsylvania', '', '', ''),
+(233, 'es_ES', 'USA - Pennsylvania', '', '', ''),
+(233, 'fr_FR', 'USA - Pennsylvania', '', '', ''),
+(234, 'en_US', 'USA - Rhode Island', '', '', ''),
+(234, 'es_ES', 'USA - Rhode Island', '', '', ''),
+(234, 'fr_FR', 'USA - Rhode Island', '', '', ''),
+(235, 'en_US', 'USA - South Carolina', '', '', ''),
+(235, 'es_ES', 'USA - South Carolina', '', '', ''),
+(235, 'fr_FR', 'USA - South Carolina', '', '', ''),
+(236, 'en_US', 'USA - South Dakota', '', '', ''),
+(236, 'es_ES', 'USA - South Dakota', '', '', ''),
+(236, 'fr_FR', 'USA - South Dakota', '', '', ''),
+(237, 'en_US', 'USA - Tennessee', '', '', ''),
+(237, 'es_ES', 'USA - Tennessee', '', '', ''),
+(237, 'fr_FR', 'USA - Tennessee', '', '', ''),
+(238, 'en_US', 'USA - Texas', '', '', ''),
+(238, 'es_ES', 'USA - Texas', '', '', ''),
+(238, 'fr_FR', 'USA - Texas', '', '', ''),
+(239, 'en_US', 'USA - Utah', '', '', ''),
+(239, 'es_ES', 'USA - Utah', '', '', ''),
+(239, 'fr_FR', 'USA - Utah', '', '', ''),
+(240, 'en_US', 'USA - Vermont', '', '', ''),
+(240, 'es_ES', 'USA - Vermont', '', '', ''),
+(240, 'fr_FR', 'USA - Vermont', '', '', ''),
+(241, 'en_US', 'USA - Virginia', '', '', ''),
+(241, 'es_ES', 'USA - Virginia', '', '', ''),
+(241, 'fr_FR', 'USA - Virginia', '', '', ''),
+(242, 'en_US', 'USA - Washington', '', '', ''),
+(242, 'es_ES', 'USA - Washington', '', '', ''),
+(242, 'fr_FR', 'USA - Washington', '', '', ''),
+(243, 'en_US', 'USA - West Virginia', '', '', ''),
+(243, 'es_ES', 'USA - West Virginia', '', '', ''),
+(243, 'fr_FR', 'USA - West Virginia', '', '', ''),
+(244, 'en_US', 'USA - Wisconsin', '', '', ''),
+(244, 'es_ES', 'USA - Wisconsin', '', '', ''),
+(244, 'fr_FR', 'USA - Wisconsin', '', '', ''),
+(245, 'en_US', 'USA - Wyoming', '', '', ''),
+(245, 'es_ES', 'USA - Wyoming', '', '', ''),
+(245, 'fr_FR', 'USA - Wyoming', '', '', ''),
+(246, 'en_US', 'Canada - Colombie-Britannique', '', '', ''),
+(246, 'es_ES', 'Canada - Colombie-Britannique', '', '', ''),
+(246, 'fr_FR', 'Canada - Colombie-Britannique', '', '', ''),
+(247, 'en_US', 'Canada - Alberta', '', '', ''),
+(247, 'es_ES', 'Canada - Alberta', '', '', ''),
+(247, 'fr_FR', 'Canada - Alberta', '', '', ''),
+(248, 'en_US', 'Canada - Saskatchewan', '', '', ''),
+(248, 'es_ES', 'Canada - Saskatchewan', '', '', ''),
+(248, 'fr_FR', 'Canada - Saskatchewan', '', '', ''),
+(249, 'en_US', 'Canada - Manitoba', '', '', ''),
+(249, 'es_ES', 'Canada - Manitoba', '', '', ''),
+(249, 'fr_FR', 'Canada - Manitoba', '', '', ''),
+(250, 'en_US', 'Canada - Ontario', '', '', ''),
+(250, 'es_ES', 'Canada - Ontario', '', '', ''),
+(250, 'fr_FR', 'Canada - Ontario', '', '', ''),
+(251, 'en_US', 'Canada - Québec', '', '', ''),
+(251, 'es_ES', 'Canada - Québec', '', '', ''),
+(251, 'fr_FR', 'Canada - Québec', '', '', ''),
+(252, 'en_US', 'Canada - Nouveau-Brunswick', '', '', ''),
+(252, 'es_ES', 'Canada - Nouveau-Brunswick', '', '', ''),
+(252, 'fr_FR', 'Canada - Nouveau-Brunswick', '', '', ''),
+(253, 'en_US', 'Canada - Nouvelle-Écosse', '', '', ''),
+(253, 'es_ES', 'Canada - Nouvelle-Écosse', '', '', ''),
+(253, 'fr_FR', 'Canada - Nouvelle-Écosse', '', '', ''),
+(254, 'en_US', 'Canada - Île-du-Prince-Édouard    ', '', '', ''),
+(254, 'es_ES', 'Canada - Île-du-Prince-Édouard    ', '', '', ''),
+(254, 'fr_FR', 'Canada - Île-du-Prince-Édouard    ', '', '', ''),
+(255, 'en_US', 'Canada - Terre-Neuve-et-Labrador    ', '', '', ''),
+(255, 'es_ES', 'Canada - Terre-Neuve-et-Labrador    ', '', '', ''),
+(255, 'fr_FR', 'Canada - Terre-Neuve-et-Labrador    ', '', '', ''),
+(256, 'en_US', 'Canada - Yukon', '', '', ''),
+(256, 'es_ES', 'Canada - Yukon', '', '', ''),
+(256, 'fr_FR', 'Canada - Yukon', '', '', ''),
+(257, 'en_US', 'Canada - Territoires-du-Nord-Ouest', '', '', ''),
+(257, 'es_ES', 'Canada - Territoires-du-Nord-Ouest', '', '', ''),
+(257, 'fr_FR', 'Canada - Territoires-du-Nord-Ouest', '', '', ''),
+(258, 'en_US', 'Canada - Nunavut', '', '', ''),
+(258, 'es_ES', 'Canada - Nunavut', '', '', ''),
+(258, 'fr_FR', 'Canada - Nunavut', '', '', ''),
+(259, 'en_US', 'Guadeloupe', '', '', ''),
+(259, 'es_ES', 'Guadeloupe', '', '', ''),
+(259, 'fr_FR', 'Guadeloupe', '', '', ''),
+(260, 'en_US', 'Guyane Française', '', '', ''),
+(260, 'es_ES', 'Guyane Française', '', '', ''),
+(260, 'fr_FR', 'Guyane Française', '', '', ''),
+(261, 'en_US', 'Martinique', '', '', ''),
+(261, 'es_ES', 'Martinique', '', '', ''),
+(261, 'fr_FR', 'Martinique', '', '', ''),
+(262, 'en_US', 'Mayotte', '', '', ''),
+(262, 'es_ES', 'Mayotte', '', '', ''),
+(262, 'fr_FR', 'Mayotte', '', '', ''),
+(263, 'en_US', 'Réunion(La)', '', '', ''),
+(263, 'es_ES', 'Réunion(La)', '', '', ''),
+(263, 'fr_FR', 'Réunion(La)', '', '', ''),
+(264, 'en_US', 'St Pierre et Miquelon', '', '', ''),
+(264, 'es_ES', 'St Pierre et Miquelon', '', '', ''),
+(264, 'fr_FR', 'St Pierre et Miquelon', '', '', ''),
+(265, 'en_US', 'Nouvelle-Calédonie', '', '', ''),
+(265, 'es_ES', 'Nouvelle-Calédonie', '', '', ''),
+(265, 'fr_FR', 'Nouvelle-Calédonie', '', '', ''),
+(266, 'en_US', 'Polynésie française', '', '', ''),
+(266, 'es_ES', 'Polynésie française', '', '', ''),
+(266, 'fr_FR', 'Polynésie française', '', '', ''),
+(267, 'en_US', 'Wallis-et-Futuna', '', '', ''),
+(267, 'es_ES', 'Wallis-et-Futuna', '', '', ''),
+(267, 'fr_FR', 'Wallis-et-Futuna', '', '', ''),
+(268, 'en_US', 'USA - Alabama', '', '', ''),
+(268, 'es_ES', 'USA - Alabama', '', '', ''),
+(268, 'fr_FR', 'USA - Alabama', '', '', '');

install/sqldb.map

@@ -0,0 +1,2 @@
+# Sqlfile -> Database map
+thelia.sql=thelia

install/thelia.sql

@@ -34,14 +34,7 @@ CREATE TABLE `product`
     `id` INTEGER NOT NULL AUTO_INCREMENT,
     `tax_rule_id` INTEGER,
     `ref` VARCHAR(255) NOT NULL,
-    `price` FLOAT NOT NULL,
-    `price2` FLOAT,
-    `ecotax` FLOAT,
-    `newness` TINYINT DEFAULT 0,
-    `promo` TINYINT DEFAULT 0,
-    `quantity` INTEGER DEFAULT 0,
     `visible` TINYINT DEFAULT 0 NOT NULL,
-    `weight` FLOAT,
     `position` INTEGER NOT NULL,
     `created_at` DATETIME,
     `updated_at` DATETIME,
@@ -203,6 +196,7 @@ CREATE TABLE `feature_av`
 (
     `id` INTEGER NOT NULL AUTO_INCREMENT,
     `feature_id` INTEGER NOT NULL,
+    `position` INTEGER NOT NULL,
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
@@ -215,12 +209,12 @@ CREATE TABLE `feature_av`
 ) ENGINE=InnoDB;
 
 -- ---------------------------------------------------------------------
--- feature_prod
+-- feature_product
 -- ---------------------------------------------------------------------
 
-DROP TABLE IF EXISTS `feature_prod`;
+DROP TABLE IF EXISTS `feature_product`;
 
-CREATE TABLE `feature_prod`
+CREATE TABLE `feature_product`
 (
     `id` INTEGER NOT NULL AUTO_INCREMENT,
     `product_id` INTEGER NOT NULL,
@@ -316,21 +310,6 @@ CREATE TABLE `attribute_av`
         ON DELETE CASCADE
 ) ENGINE=InnoDB;
 
--- ---------------------------------------------------------------------
--- combination
--- ---------------------------------------------------------------------
-
-DROP TABLE IF EXISTS `combination`;
-
-CREATE TABLE `combination`
-(
-    `id` INTEGER NOT NULL AUTO_INCREMENT,
-    `ref` VARCHAR(255),
-    `created_at` DATETIME,
-    `updated_at` DATETIME,
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
-
 -- ---------------------------------------------------------------------
 -- attribute_combination
 -- ---------------------------------------------------------------------
@@ -339,31 +318,28 @@ DROP TABLE IF EXISTS `attribute_combination`;
 
 CREATE TABLE `attribute_combination`
 (
-    `id` INTEGER NOT NULL AUTO_INCREMENT,
     `attribute_id` INTEGER NOT NULL,
-    `combination_id` INTEGER NOT NULL,
     `attribute_av_id` INTEGER NOT NULL,
+    `stock_id` INTEGER NOT NULL,
     `created_at` DATETIME,
     `updated_at` DATETIME,
-    PRIMARY KEY (`id`,`attribute_id`,`combination_id`,`attribute_av_id`),
+    PRIMARY KEY (`attribute_id`,`attribute_av_id`,`stock_id`),
-    INDEX `idx_ attribute_combination_attribute_id` (`attribute_id`),
+    INDEX `idx_attribute_combination_attribute_id` (`attribute_id`),
-    INDEX `idx_ attribute_combination_attribute_av_id` (`attribute_av_id`),
+    INDEX `idx_attribute_combination_attribute_av_id` (`attribute_av_id`),
-    INDEX `idx_ attribute_combination_combination_id` (`combination_id`),
+    INDEX `idx_attribute_combination_stock_id` (`stock_id`),
-    CONSTRAINT `fk_ attribute_combination_attribute_id`
+    CONSTRAINT `fk_attribute_combination_attribute_id`
         FOREIGN KEY (`attribute_id`)
         REFERENCES `attribute` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE,
-    CONSTRAINT `fk_ attribute_combination_attribute_av_id`
+    CONSTRAINT `fk_attribute_combination_attribute_av_id`
         FOREIGN KEY (`attribute_av_id`)
         REFERENCES `attribute_av` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE,
-    CONSTRAINT `fk_ attribute_combination_combination_id`
+    CONSTRAINT `fk_attribute_combination_stock_id`
-        FOREIGN KEY (`combination_id`)
+        FOREIGN KEY (`stock_id`)
-        REFERENCES `combination` (`id`)
+        REFERENCES `stock` (`id`)
-        ON UPDATE RESTRICT
-        ON DELETE CASCADE
 ) ENGINE=InnoDB;
 
 -- ---------------------------------------------------------------------
@@ -375,20 +351,16 @@ DROP TABLE IF EXISTS `stock`;
 CREATE TABLE `stock`
 (
     `id` INTEGER NOT NULL AUTO_INCREMENT,
-    `combination_id` INTEGER,
     `product_id` INTEGER NOT NULL,
     `increase` FLOAT,
     `quantity` FLOAT NOT NULL,
+    `promo` TINYINT DEFAULT 0,
+    `newness` TINYINT DEFAULT 0,
+    `weight` FLOAT,
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
-    INDEX `idx_stock_combination_id` (`combination_id`),
     INDEX `idx_stock_product_id` (`product_id`),
-    CONSTRAINT `fk_stock_combination_id`
-        FOREIGN KEY (`combination_id`)
-        REFERENCES `combination` (`id`)
-        ON UPDATE RESTRICT
-        ON DELETE SET NULL,
     CONSTRAINT `fk_stock_product_id`
         FOREIGN KEY (`product_id`)
         REFERENCES `product` (`id`)
@@ -1341,22 +1313,48 @@ CREATE TABLE `cart_item`
     `cart_id` INTEGER NOT NULL,
     `product_id` INTEGER NOT NULL,
     `quantity` FLOAT DEFAULT 1,
-    `combination_id` INTEGER,
+    `stock_id` INTEGER NOT NULL,
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
     INDEX `idx_cart_item_cart_id` (`cart_id`),
     INDEX `idx_cart_item_product_id` (`product_id`),
-    INDEX `idx_cart_item_combination_id` (`combination_id`),
+    INDEX `idx_cart_item_stock_id` (`stock_id`),
     CONSTRAINT `fk_cart_item_cart_id`
         FOREIGN KEY (`cart_id`)
         REFERENCES `cart` (`id`),
     CONSTRAINT `fk_cart_item_product_id`
         FOREIGN KEY (`product_id`)
         REFERENCES `product` (`id`),
-    CONSTRAINT `fk_cart_item_combination_id`
+    CONSTRAINT `fk_cart_item_stock_id`
-        FOREIGN KEY (`combination_id`)
+        FOREIGN KEY (`stock_id`)
-        REFERENCES `combination` (`id`)
+        REFERENCES `stock` (`id`)
+) ENGINE=InnoDB;
+
+-- ---------------------------------------------------------------------
+-- product_price
+-- ---------------------------------------------------------------------
+
+DROP TABLE IF EXISTS `product_price`;
+
+CREATE TABLE `product_price`
+(
+    `id` INTEGER NOT NULL AUTO_INCREMENT,
+    `stock_id` INTEGER NOT NULL,
+    `currency_id` INTEGER NOT NULL,
+    `price` FLOAT NOT NULL,
+    `promo_price` FLOAT,
+    `created_at` DATETIME,
+    `updated_at` DATETIME,
+    PRIMARY KEY (`id`),
+    INDEX `idx_product_price_stock_id` (`stock_id`),
+    INDEX `idx_product_price_currency_id` (`currency_id`),
+    CONSTRAINT `fk_product_price_stock_id`
+        FOREIGN KEY (`stock_id`)
+        REFERENCES `stock` (`id`),
+    CONSTRAINT `fk_product_price_currency_id`
+        FOREIGN KEY (`currency_id`)
+        REFERENCES `currency` (`id`)
 ) ENGINE=InnoDB;
 
 -- ---------------------------------------------------------------------
@@ -1805,14 +1803,7 @@ CREATE TABLE `product_version`
     `id` INTEGER NOT NULL,
     `tax_rule_id` INTEGER,
     `ref` VARCHAR(255) NOT NULL,
-    `price` FLOAT NOT NULL,
-    `price2` FLOAT,
-    `ecotax` FLOAT,
-    `newness` TINYINT DEFAULT 0,
-    `promo` TINYINT DEFAULT 0,
-    `quantity` INTEGER DEFAULT 0,
     `visible` TINYINT DEFAULT 0 NOT NULL,
-    `weight` FLOAT,
     `position` INTEGER NOT NULL,
     `created_at` DATETIME,
     `updated_at` DATETIME,

local/config/schema.xml

@@ -9,7 +9,6 @@
     <column name="description" type="CLOB" />
     <column name="chapo" type="LONGVARCHAR" />
     <column name="postscriptum" type="LONGVARCHAR" />
-    <behavior name="timestampable" />
     <behavior name="i18n">
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
     </behavior>
@@ -17,19 +16,13 @@
       <parameter name="log_created_at" value="true" />
       <parameter name="log_created_by" value="true" />
     </behavior>
+    <behavior name="timestampable" />
   </table>
   <table name="product" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="tax_rule_id" type="INTEGER" />
     <column name="ref" required="true" size="255" type="VARCHAR" />
-    <column name="price" required="true" type="FLOAT" />
-    <column name="price2" type="FLOAT" />
-    <column name="ecotax" type="FLOAT" />
-    <column defaultValue="0" name="newness" type="TINYINT" />
-    <column defaultValue="0" name="promo" type="TINYINT" />
-    <column defaultValue="0" name="quantity" type="INTEGER" />
     <column defaultValue="0" name="visible" required="true" type="TINYINT" />
-    <column name="weight" type="FLOAT" />
     <column name="position" required="true" type="INTEGER" />
     <column name="title" size="255" type="VARCHAR" />
     <column name="description" type="CLOB" />
@@ -151,6 +144,7 @@
   <table name="feature_av" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="feature_id" required="true" type="INTEGER" />
+    <column name="position" required="true" type="INTEGER" />
     <column name="title" size="255" type="VARCHAR" />
     <column name="description" type="CLOB" />
     <column name="chapo" type="LONGVARCHAR" />
@@ -166,7 +160,7 @@
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
     </behavior>
   </table>
-  <table name="feature_prod" namespace="Thelia\Model">
+  <table name="feature_product" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="product_id" required="true" type="INTEGER" />
     <column name="feature_id" required="true" type="INTEGER" />
@@ -242,51 +236,41 @@
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
     </behavior>
   </table>
-  <table name="combination" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="ref" size="255" type="VARCHAR" />
-    <behavior name="timestampable" />
-  </table>
   <table name="attribute_combination" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="attribute_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="combination_id" primaryKey="true" required="true" type="INTEGER" />
     <column name="attribute_av_id" primaryKey="true" required="true" type="INTEGER" />
-    <foreign-key foreignTable="attribute" name="fk_ attribute_combination_attribute_id" onDelete="CASCADE" onUpdate="RESTRICT">
+    <column name="stock_id" primaryKey="true" required="true" type="INTEGER" />
+    <foreign-key foreignTable="attribute" name="fk_attribute_combination_attribute_id" onDelete="CASCADE" onUpdate="RESTRICT">
       <reference foreign="id" local="attribute_id" />
     </foreign-key>
-    <foreign-key foreignTable="attribute_av" name="fk_ attribute_combination_attribute_av_id" onDelete="CASCADE" onUpdate="RESTRICT">
+    <foreign-key foreignTable="attribute_av" name="fk_attribute_combination_attribute_av_id" onDelete="CASCADE" onUpdate="RESTRICT">
       <reference foreign="id" local="attribute_av_id" />
     </foreign-key>
-    <foreign-key foreignTable="combination" name="fk_ attribute_combination_combination_id" onDelete="CASCADE" onUpdate="RESTRICT">
+    <foreign-key foreignTable="stock" name="fk_attribute_combination_stock_id">
-      <reference foreign="id" local="combination_id" />
+      <reference foreign="id" local="stock_id" />
     </foreign-key>
-    <index name="idx_ attribute_combination_attribute_id">
+    <index name="idx_attribute_combination_attribute_id">
       <index-column name="attribute_id" />
     </index>
-    <index name="idx_ attribute_combination_attribute_av_id">
+    <index name="idx_attribute_combination_attribute_av_id">
       <index-column name="attribute_av_id" />
     </index>
-    <index name="idx_ attribute_combination_combination_id">
+    <index name="idx_attribute_combination_stock_id">
-      <index-column name="combination_id" />
+      <index-column name="stock_id" />
     </index>
     <behavior name="timestampable" />
   </table>
   <table name="stock" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="combination_id" type="INTEGER" />
     <column name="product_id" required="true" type="INTEGER" />
     <column name="increase" type="FLOAT" />
     <column name="quantity" required="true" type="FLOAT" />
-    <foreign-key foreignTable="combination" name="fk_stock_combination_id" onDelete="SET NULL" onUpdate="RESTRICT">
+    <column defaultValue="0" name="promo" type="TINYINT" />
-      <reference foreign="id" local="combination_id" />
+    <column defaultValue="0" name="newness" type="TINYINT" />
-    </foreign-key>
+    <column name="weight" type="FLOAT" />
     <foreign-key foreignTable="product" name="fk_stock_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
       <reference foreign="id" local="product_id" />
     </foreign-key>
-    <index name="idx_stock_combination_id">
-      <index-column name="combination_id" />
-    </index>
     <index name="idx_stock_product_id">
       <index-column name="product_id" />
     </index>
@@ -977,15 +961,15 @@
     <column name="cart_id" required="true" type="INTEGER" />
     <column name="product_id" required="true" type="INTEGER" />
     <column defaultValue="1" name="quantity" type="FLOAT" />
-    <column name="combination_id" type="INTEGER" />
+    <column name="stock_id" required="true" type="INTEGER" />
     <foreign-key foreignTable="cart" name="fk_cart_item_cart_id">
       <reference foreign="id" local="cart_id" />
     </foreign-key>
     <foreign-key foreignTable="product" name="fk_cart_item_product_id">
       <reference foreign="id" local="product_id" />
     </foreign-key>
-    <foreign-key foreignTable="combination" name="fk_cart_item_combination_id">
+    <foreign-key foreignTable="stock" name="fk_cart_item_stock_id">
-      <reference foreign="id" local="combination_id" />
+      <reference foreign="id" local="stock_id" />
     </foreign-key>
     <index name="idx_cart_item_cart_id">
       <index-column name="cart_id" />
@@ -993,8 +977,28 @@
     <index name="idx_cart_item_product_id">
       <index-column name="product_id" />
     </index>
-    <index name="idx_cart_item_combination_id">
+    <index name="idx_cart_item_stock_id">
-      <index-column name="combination_id" />
+      <index-column name="stock_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="product_price" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="stock_id" required="true" type="INTEGER" />
+    <column name="currency_id" required="true" type="INTEGER" />
+    <column name="price" required="true" type="FLOAT" />
+    <column name="promo_price" type="FLOAT" />
+    <foreign-key foreignTable="stock" name="fk_product_price_stock_id">
+      <reference foreign="id" local="stock_id" />
+    </foreign-key>
+    <foreign-key foreignTable="currency" name="fk_product_price_currency_id">
+      <reference foreign="id" local="currency_id" />
+    </foreign-key>
+    <index name="idx_product_price_stock_id">
+      <index-column name="stock_id" />
+    </index>
+    <index name="idx_product_price_currency_id">
+      <index-column name="currency_id" />
     </index>
     <behavior name="timestampable" />
   </table>

templates/default/category.html

@@ -47,9 +47,35 @@
 {/loop*}
 
 {loop name="product" type="product" order="ref"}
-    <h3>PRODUCT : #REF / #TITLE</h3>
+    <h3>PRODUCT #ID : #REF / #TITLE</h3>
+
     <h4>Accessories</h4>
-    {loop name="acc" type="accessory" product="#ID" order="accessory,max_price"}
+        <ul>
-        #REF -
+    {loop name="acc" type="accessory" product="#ID" order="accessory"}
+        <li>#REF</li>
     {/loop}
-{/loop}
+        </ul>
+
+    <h4>Features</h4>
+    <ul>
+        {loop name="ft" type="feature" order="manual" product="#ID"}
+        <li>#TITLE</li>
+        {/loop}
+    </ul>
+
+{/loop}
+
+<h2>ALL FEATURES AND THEIR AVAILABILITY</h2>
+
+<ul>
+    {loop name="ft" type="feature" order="manual"}
+    <li>
+        #TITLE
+        <ul>
+            {loop name="ftav" type="feature_available" order="manual" feature="#ID"}
+                <li>#TITLE</li>
+            {/loop}
+        </ul>
+    </li>
+    {/loop}
+</ul>

templates/default/customer.html

@@ -17,7 +17,7 @@
             <td>Title</td>
             <td>
                 {loop name="title" type="title" id="#TITLE"}
-                    #LONG (#SHORT)
+                #LONG (#SHORT)
                 {/loop}
             </td>
         </tr>
@@ -65,9 +65,14 @@
     <tr>
         <td>Title</td>
         <td>
-            {loop name="title" type="title"}
+            <ul>
-            #LONG (#SHORT)
+                {assign var=current_title value=#TITLE}
-            {/loop}
+                {loop name="title" type="title"}
+                <li {if $current_title==#ID}style="background-color: yellow"{/if}>
+                #LONG (#SHORT)
+                </li>
+                {/loop}
+            </ul>
         </td>
     </tr>
     <tr>
@@ -94,6 +99,19 @@
         <td>City</td>
         <td>#CITY</td>
     </tr>
+    <tr>
+        <td>Country</td>
+        <td>
+            <select>
+                {assign var=current_country value=#COUNTRY}
+                {loop name="country" type="country"}
+                <option {if $current_country==#ID}selected="selected"{/if}>
+                    #TITLE (#ID - #ISOCODE - #ISOALPHA2 - #ISOALPHA3)
+                </option>
+                {/loop}
+            </select>
+        </td>
+    </tr>
     <tr>
         <td>Phone</td>
         <td>#PHONE</td>