From 50212c55cf50a55f702b863fec3d5cac3fb83f59 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 17 Sep 2013 17:50:05 +0200
Subject: [PATCH 1/4] remove old model classes:

---
 core/lib/Thelia/Model/Rewriting.php           |  9 --------
 core/lib/Thelia/Model/RewritingQuery.php      | 20 ----------------
 .../Thelia/Model/Tools/UrlRewritingTrait.php  | 23 ++++++++++++++++++-
 3 files changed, 22 insertions(+), 30 deletions(-)
 delete mode 100644 core/lib/Thelia/Model/Rewriting.php
 delete mode 100644 core/lib/Thelia/Model/RewritingQuery.php

diff --git a/core/lib/Thelia/Model/Rewriting.php b/core/lib/Thelia/Model/Rewriting.php
deleted file mode 100644
index 8d6f75fab..000000000
--- a/core/lib/Thelia/Model/Rewriting.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-use Thelia\Model\Base\Rewriting as BaseRewriting;
-
-class Rewriting extends BaseRewriting {
-
-}
diff --git a/core/lib/Thelia/Model/RewritingQuery.php b/core/lib/Thelia/Model/RewritingQuery.php
deleted file mode 100644
index df2cc6161..000000000
--- a/core/lib/Thelia/Model/RewritingQuery.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-use Thelia\Model\Base\RewritingQuery as BaseRewritingQuery;
-
-
-/**
- * Skeleton subclass for performing query and update operations on the 'rewriting' 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 RewritingQuery extends BaseRewritingQuery {
-
-} // RewritingQuery
diff --git a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
index 6ab24fbc4..f50da56d5 100644
--- a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
+++ b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
@@ -23,6 +23,8 @@
 
 namespace Thelia\Model\Tools;
 
+use Thelia\Exception\UrlRewritingException;
+use Thelia\Model\Rewriting;
 use Thelia\Tools\URL;
 /**
  * A trait for managing Rewriten URLs from model classes
@@ -51,7 +53,26 @@ trait UrlRewritingTrait {
      */
     public function generateRewritenUrl($locale)
     {
-        URL::getInstance()->generateRewritenUrl($this->getRewritenUrlViewName(), $this->getId(), $locale, $this->getTitle());
+        // Borrowed from http://stackoverflow.com/questions/2668854/sanitizing-strings-to-make-them-url-and-filename-safe
+
+        $this->setLocale($locale);
+        // Replace all weird characters with dashes
+        $string = preg_replace('/[^\w\-~_\.]+/u', '-', $this->getTitle());
+
+        // Only allow one dash separator at a time (and make string lowercase)
+        $cleanString = mb_strtolower(preg_replace('/--+/u', '-', $string), 'UTF-8');
+
+        $urlFilePart = $cleanString . ".html";
+
+        // TODO :
+        // check if URL url already exists, and add a numeric suffix, or the like
+        try{
+            URL::getInstance()->resolve($urlFilePart);
+        } catch (UrlRewritingException $e) {
+
+        }
+        // insert the URL in the rewriting table
+        //URL::getInstance()->generateRewritenUrl($this->getRewritenUrlViewName(), $this->getId(), $locale, $this->getTitle());
     }
 
     /**

From 60d09dc76e86c96f7690815850f7db727a848aaa Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 17 Sep 2013 19:11:44 +0200
Subject: [PATCH 2/4] refactor rewrriten method name

---
 core/lib/Thelia/Model/Category.php            |  4 +-
 core/lib/Thelia/Model/Content.php             |  4 +-
 core/lib/Thelia/Model/Folder.php              |  4 +-
 core/lib/Thelia/Model/Product.php             |  4 +-
 core/lib/Thelia/Model/RewritingUrl.php        | 17 +++++
 .../Thelia/Model/Tools/UrlRewritingTrait.php  | 63 +++++++++++++++----
 6 files changed, 76 insertions(+), 20 deletions(-)

diff --git a/core/lib/Thelia/Model/Category.php b/core/lib/Thelia/Model/Category.php
index 042864de0..91b32eec7 100755
--- a/core/lib/Thelia/Model/Category.php
+++ b/core/lib/Thelia/Model/Category.php
@@ -28,7 +28,7 @@ class Category extends BaseCategory
     /**
      * {@inheritDoc}
      */
-    protected function getRewritenUrlViewName() {
+    protected function getRewrittenUrlViewName() {
         return 'category';
     }
 
@@ -69,7 +69,7 @@ class Category extends BaseCategory
     {
         $this->setPosition($this->getNextPosition());
 
-        $this->generateRewritenUrl($this->getLocale());
+        $this->generateRewrittenUrl($this->getLocale());
 
         $this->dispatchEvent(TheliaEvents::BEFORE_CREATECATEGORY, new CategoryEvent($this));
 
diff --git a/core/lib/Thelia/Model/Content.php b/core/lib/Thelia/Model/Content.php
index 79660f93a..d626bfb10 100755
--- a/core/lib/Thelia/Model/Content.php
+++ b/core/lib/Thelia/Model/Content.php
@@ -17,7 +17,7 @@ class Content extends BaseContent
     /**
      * {@inheritDoc}
      */
-    protected function getRewritenUrlViewName() {
+    protected function getRewrittenUrlViewName() {
         return 'content';
     }
 
@@ -37,7 +37,7 @@ class Content extends BaseContent
     {
         $this->setPosition($this->getNextPosition());
 
-        $this->generateRewritenUrl($this->getLocale());
+        $this->generateRewrittenUrl($this->getLocale());
 
         return true;
     }
diff --git a/core/lib/Thelia/Model/Folder.php b/core/lib/Thelia/Model/Folder.php
index 1e73e7e23..318edb7ac 100755
--- a/core/lib/Thelia/Model/Folder.php
+++ b/core/lib/Thelia/Model/Folder.php
@@ -17,7 +17,7 @@ class Folder extends BaseFolder
     /**
      * {@inheritDoc}
      */
-    protected function getRewritenUrlViewName() {
+    protected function getRewrittenUrlViewName() {
         return 'folder';
     }
 
@@ -67,7 +67,7 @@ class Folder extends BaseFolder
     {
         $this->setPosition($this->getNextPosition());
 
-        $this->generateRewritenUrl($this->getLocale());
+        $this->generateRewrittenUrl($this->getLocale());
 
         return true;
     }
diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php
index 87b414dd9..d227cc9a2 100755
--- a/core/lib/Thelia/Model/Product.php
+++ b/core/lib/Thelia/Model/Product.php
@@ -21,7 +21,7 @@ class Product extends BaseProduct
     /**
      * {@inheritDoc}
      */
-    protected function getRewritenUrlViewName() {
+    protected function getRewrittenUrlViewName() {
         return 'product';
     }
 
@@ -106,7 +106,7 @@ class Product extends BaseProduct
     {
         $this->setPosition($this->getNextPosition());
 
-        $this->generateRewritenUrl($this->getLocale());
+        $this->generateRewrittenUrl($this->getLocale());
 
         $this->dispatchEvent(TheliaEvents::BEFORE_CREATEPRODUCT, new ProductEvent($this));
 
diff --git a/core/lib/Thelia/Model/RewritingUrl.php b/core/lib/Thelia/Model/RewritingUrl.php
index 58dde9388..9dd826d01 100644
--- a/core/lib/Thelia/Model/RewritingUrl.php
+++ b/core/lib/Thelia/Model/RewritingUrl.php
@@ -2,8 +2,25 @@
 
 namespace Thelia\Model;
 
+use Propel\Runtime\Connection\ConnectionInterface;
 use Thelia\Model\Base\RewritingUrl as BaseRewritingUrl;
+use Thelia\Model\RewritingUrlQuery;
 
 class RewritingUrl extends BaseRewritingUrl {
 
+    public function preSave(ConnectionInterface $con = null)
+    {
+        if($this->getRedirected() == 0) {
+            //check if rewriting url alredy exists and put redirect to 1
+            RewritingUrlQuery::create()
+                ->filterByView($this->getView())
+                ->filterByViewId($this->getViewId())
+                ->filterByViewLocale($this->getViewLocale())
+                ->update(array(
+                    "redirect" => 1
+                ));
+        }
+
+        return true;
+    }
 }
diff --git a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
index f50da56d5..c9154a0db 100644
--- a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
+++ b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
@@ -24,7 +24,8 @@
 namespace Thelia\Model\Tools;
 
 use Thelia\Exception\UrlRewritingException;
-use Thelia\Model\Rewriting;
+use Thelia\Model\RewritingUrlQuery;
+use Thelia\Model\RewritingUrl;
 use Thelia\Tools\URL;
 /**
  * A trait for managing Rewriten URLs from model classes
@@ -34,7 +35,7 @@ trait UrlRewritingTrait {
     /**
      * @returns string the view name of the rewriten object (e.g., 'category', 'product')
      */
-    protected abstract function getRewritenUrlViewName();
+    protected abstract function getRewrittenUrlViewName();
 
     /**
      * Get the object URL for the given locale, rewriten if rewriting is enabled.
@@ -43,7 +44,7 @@ trait UrlRewritingTrait {
      */
     public function getUrl($locale)
     {
-        return URL::getInstance()->retrieve($this->getRewritenUrlViewName(), $this->getId(), $locale)->toString();
+        return URL::getInstance()->retrieve($this->getRewrittenUrlViewName(), $this->getId(), $locale)->toString();
     }
 
     /**
@@ -51,13 +52,22 @@ trait UrlRewritingTrait {
      *
      * @param string $locale a valid locale (e.g. en_US)
      */
-    public function generateRewritenUrl($locale)
+    public function generateRewrittenUrl($locale)
     {
+        if ($this->isNew()) {
+            throw new \RuntimeException(sprintf('Object %s must be save before generating url', $this->getRewrittenUrlViewName()));
+        }
         // Borrowed from http://stackoverflow.com/questions/2668854/sanitizing-strings-to-make-them-url-and-filename-safe
 
         $this->setLocale($locale);
+
+        $title = $this->getTitle();
+
+        if (null === $title) {
+            throw new \RuntimeException(sprintf('Impossible to generate url if title does not exists for the locale %s', $locale));
+        }
         // Replace all weird characters with dashes
-        $string = preg_replace('/[^\w\-~_\.]+/u', '-', $this->getTitle());
+        $string = preg_replace('/[^\w\-~_\.]+/u', '-', $title);
 
         // Only allow one dash separator at a time (and make string lowercase)
         $cleanString = mb_strtolower(preg_replace('/--+/u', '-', $string), 'UTF-8');
@@ -67,30 +77,59 @@ trait UrlRewritingTrait {
         // TODO :
         // check if URL url already exists, and add a numeric suffix, or the like
         try{
-            URL::getInstance()->resolve($urlFilePart);
+            $i=0;
+            while(URL::getInstance()->resolve($urlFilePart)) {
+                $i++;
+                $urlFilePart = sprintf("%s-%d.html",$cleanString, $i);
+            }
         } catch (UrlRewritingException $e) {
-
+            $rewritingUrl = new RewritingUrl();
+            $rewritingUrl->setUrl($urlFilePart)
+                ->setView($this->getRewrittenUrlViewName())
+                ->setViewId($this->getId())
+                ->setViewLocale($locale)
+                ->setRedirected(0)
+                ->save()
+            ;
         }
-        // insert the URL in the rewriting table
-        //URL::getInstance()->generateRewritenUrl($this->getRewritenUrlViewName(), $this->getId(), $locale, $this->getTitle());
+
+        return $urlFilePart;
+
     }
 
     /**
      * return the rewriten URL for the given locale
      *
      * @param string $locale a valid locale (e.g. en_US)
+     * @return null
      */
-    public function getRewritenUrl($locale)
+    public function getRewrittenUrl($locale)
     {
-        return "fake url - TODO";
+        $rewritingUrl = RewritingUrlQuery::create()
+            ->filterByViewLocale($locale)
+            ->filterByView($this->getRewrittenUrlViewName())
+            ->filterByViewId($this->getId())
+            ->filterByRedirected(0)
+            ->findOne()
+        ;
+
+        if($rewritingUrl) {
+            $url = $rewritingUrl->getUrl();
+        } else {
+            $url = null;
+        }
+
+        return $url;
     }
 
     /**
      * Set the rewriten URL for the given locale
      *
      * @param string $locale a valid locale (e.g. en_US)
+     * @param $url the wanted url
+     * @return $this
      */
-    public function setRewritenUrl($locale, $url)
+    public function setRewrittenUrl($locale, $url)
     {
         // TODO - code me !
 

From e1e383707b04f59ee33eb80fdb0b86e0b23bbf49 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 17 Sep 2013 19:19:52 +0200
Subject: [PATCH 3/4] template is not mandatory in product table.

---
 core/lib/Thelia/Model/Base/ProductQuery.php   |    4 +-
 core/lib/Thelia/Model/Base/Template.php       |    9 +-
 core/lib/Thelia/Model/Base/TemplateQuery.php  |    4 +-
 core/lib/Thelia/Model/Category.php            |    3 +-
 core/lib/Thelia/Model/Content.php             |    7 +-
 core/lib/Thelia/Model/Folder.php              |    6 +-
 core/lib/Thelia/Model/Map/ProductTableMap.php |    2 +-
 .../Model/Map/ProductVersionTableMap.php      |    2 +-
 core/lib/Thelia/Model/Product.php             |    3 +-
 install/thelia.sql                            |    4 +-
 local/config/schema.xml                       | 2398 ++++++++---------
 11 files changed, 1225 insertions(+), 1217 deletions(-)

diff --git a/core/lib/Thelia/Model/Base/ProductQuery.php b/core/lib/Thelia/Model/Base/ProductQuery.php
index 9b1710f03..9c3b0759c 100644
--- a/core/lib/Thelia/Model/Base/ProductQuery.php
+++ b/core/lib/Thelia/Model/Base/ProductQuery.php
@@ -857,7 +857,7 @@ abstract class ProductQuery extends ModelCriteria
      *
      * @return ChildProductQuery The current query, for fluid interface
      */
-    public function joinTemplate($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function joinTemplate($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
         $tableMap = $this->getTableMap();
         $relationMap = $tableMap->getRelation('Template');
@@ -892,7 +892,7 @@ abstract class ProductQuery extends ModelCriteria
      *
      * @return   \Thelia\Model\TemplateQuery A secondary query class using the current class as primary query
      */
-    public function useTemplateQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function useTemplateQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
         return $this
             ->joinTemplate($relationAlias, $joinType)
diff --git a/core/lib/Thelia/Model/Base/Template.php b/core/lib/Thelia/Model/Base/Template.php
index 77efa7ba0..08bb0f3a0 100644
--- a/core/lib/Thelia/Model/Base/Template.php
+++ b/core/lib/Thelia/Model/Base/Template.php
@@ -864,9 +864,10 @@ abstract class Template implements ActiveRecordInterface
 
             if ($this->productsScheduledForDeletion !== null) {
                 if (!$this->productsScheduledForDeletion->isEmpty()) {
-                    \Thelia\Model\ProductQuery::create()
-                        ->filterByPrimaryKeys($this->productsScheduledForDeletion->getPrimaryKeys(false))
-                        ->delete($con);
+                    foreach ($this->productsScheduledForDeletion as $product) {
+                        // need to save related object because we set the relation to null
+                        $product->save($con);
+                    }
                     $this->productsScheduledForDeletion = null;
                 }
             }
@@ -1553,7 +1554,7 @@ abstract class Template implements ActiveRecordInterface
                 $this->productsScheduledForDeletion = clone $this->collProducts;
                 $this->productsScheduledForDeletion->clear();
             }
-            $this->productsScheduledForDeletion[]= clone $product;
+            $this->productsScheduledForDeletion[]= $product;
             $product->setTemplate(null);
         }
 
diff --git a/core/lib/Thelia/Model/Base/TemplateQuery.php b/core/lib/Thelia/Model/Base/TemplateQuery.php
index 506d7d943..98c588dd8 100644
--- a/core/lib/Thelia/Model/Base/TemplateQuery.php
+++ b/core/lib/Thelia/Model/Base/TemplateQuery.php
@@ -395,7 +395,7 @@ abstract class TemplateQuery extends ModelCriteria
      *
      * @return ChildTemplateQuery The current query, for fluid interface
      */
-    public function joinProduct($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function joinProduct($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
         $tableMap = $this->getTableMap();
         $relationMap = $tableMap->getRelation('Product');
@@ -430,7 +430,7 @@ abstract class TemplateQuery extends ModelCriteria
      *
      * @return   \Thelia\Model\ProductQuery A secondary query class using the current class as primary query
      */
-    public function useProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function useProductQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
         return $this
             ->joinProduct($relationAlias, $joinType)
diff --git a/core/lib/Thelia/Model/Category.php b/core/lib/Thelia/Model/Category.php
index 91b32eec7..204896674 100755
--- a/core/lib/Thelia/Model/Category.php
+++ b/core/lib/Thelia/Model/Category.php
@@ -69,8 +69,6 @@ class Category extends BaseCategory
     {
         $this->setPosition($this->getNextPosition());
 
-        $this->generateRewrittenUrl($this->getLocale());
-
         $this->dispatchEvent(TheliaEvents::BEFORE_CREATECATEGORY, new CategoryEvent($this));
 
         return true;
@@ -81,6 +79,7 @@ class Category extends BaseCategory
      */
     public function postInsert(ConnectionInterface $con = null)
     {
+        //$this->generateRewrittenUrl($this->getLocale());
         $this->dispatchEvent(TheliaEvents::AFTER_CREATECATEGORY, new CategoryEvent($this));
     }
 
diff --git a/core/lib/Thelia/Model/Content.php b/core/lib/Thelia/Model/Content.php
index d626bfb10..4d9cf9f3a 100755
--- a/core/lib/Thelia/Model/Content.php
+++ b/core/lib/Thelia/Model/Content.php
@@ -37,8 +37,11 @@ class Content extends BaseContent
     {
         $this->setPosition($this->getNextPosition());
 
-        $this->generateRewrittenUrl($this->getLocale());
-
         return true;
     }
+
+    public function postInsert(ConnectionInterface $con = null)
+    {
+        //$this->generateRewrittenUrl($this->getLocale());
+    }
 }
diff --git a/core/lib/Thelia/Model/Folder.php b/core/lib/Thelia/Model/Folder.php
index 318edb7ac..e32505d9d 100755
--- a/core/lib/Thelia/Model/Folder.php
+++ b/core/lib/Thelia/Model/Folder.php
@@ -67,8 +67,12 @@ class Folder extends BaseFolder
     {
         $this->setPosition($this->getNextPosition());
 
-        $this->generateRewrittenUrl($this->getLocale());
 
         return true;
     }
+
+    public function postInsert(ConnectionInterface $con = null)
+    {
+        //$this->generateRewrittenUrl($this->getLocale());
+    }
 }
diff --git a/core/lib/Thelia/Model/Map/ProductTableMap.php b/core/lib/Thelia/Model/Map/ProductTableMap.php
index 17c4585f0..59ac236ac 100644
--- a/core/lib/Thelia/Model/Map/ProductTableMap.php
+++ b/core/lib/Thelia/Model/Map/ProductTableMap.php
@@ -189,7 +189,7 @@ class ProductTableMap extends TableMap
         $this->addColumn('REF', 'Ref', 'VARCHAR', true, 255, null);
         $this->addColumn('VISIBLE', 'Visible', 'TINYINT', true, null, 0);
         $this->addColumn('POSITION', 'Position', 'INTEGER', true, null, null);
-        $this->addForeignKey('TEMPLATE_ID', 'TemplateId', 'INTEGER', 'template', 'ID', true, null, null);
+        $this->addForeignKey('TEMPLATE_ID', 'TemplateId', 'INTEGER', 'template', 'ID', false, null, null);
         $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
         $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
         $this->addColumn('VERSION', 'Version', 'INTEGER', false, null, 0);
diff --git a/core/lib/Thelia/Model/Map/ProductVersionTableMap.php b/core/lib/Thelia/Model/Map/ProductVersionTableMap.php
index 4e84b4db8..14d38a764 100644
--- a/core/lib/Thelia/Model/Map/ProductVersionTableMap.php
+++ b/core/lib/Thelia/Model/Map/ProductVersionTableMap.php
@@ -180,7 +180,7 @@ class ProductVersionTableMap extends TableMap
         $this->addColumn('REF', 'Ref', 'VARCHAR', true, 255, null);
         $this->addColumn('VISIBLE', 'Visible', 'TINYINT', true, null, 0);
         $this->addColumn('POSITION', 'Position', 'INTEGER', true, null, null);
-        $this->addColumn('TEMPLATE_ID', 'TemplateId', 'INTEGER', true, null, null);
+        $this->addColumn('TEMPLATE_ID', 'TemplateId', 'INTEGER', false, null, null);
         $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
         $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
         $this->addPrimaryKey('VERSION', 'Version', 'INTEGER', true, null, 0);
diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php
index 2be99958c..be534298e 100755
--- a/core/lib/Thelia/Model/Product.php
+++ b/core/lib/Thelia/Model/Product.php
@@ -107,7 +107,7 @@ class Product extends BaseProduct
     {
         $this->setPosition($this->getNextPosition());
 
-        $this->generateRewrittenUrl($this->getLocale());
+
 
         $this->dispatchEvent(TheliaEvents::BEFORE_CREATEPRODUCT, new ProductEvent($this));
 
@@ -119,6 +119,7 @@ class Product extends BaseProduct
      */
     public function postInsert(ConnectionInterface $con = null)
     {
+        //$this->generateRewrittenUrl($this->getLocale());
         $this->dispatchEvent(TheliaEvents::AFTER_CREATEPRODUCT, new ProductEvent($this));
     }
 
diff --git a/install/thelia.sql b/install/thelia.sql
index 3dc5d0454..b49840d9b 100755
--- a/install/thelia.sql
+++ b/install/thelia.sql
@@ -36,7 +36,7 @@ CREATE TABLE `product`
     `ref` VARCHAR(255) NOT NULL,
     `visible` TINYINT DEFAULT 0 NOT NULL,
     `position` INTEGER NOT NULL,
-    `template_id` INTEGER NOT NULL,
+    `template_id` INTEGER,
     `created_at` DATETIME,
     `updated_at` DATETIME,
     `version` INTEGER DEFAULT 0,
@@ -2167,7 +2167,7 @@ CREATE TABLE `product_version`
     `ref` VARCHAR(255) NOT NULL,
     `visible` TINYINT DEFAULT 0 NOT NULL,
     `position` INTEGER NOT NULL,
-    `template_id` INTEGER NOT NULL,
+    `template_id` INTEGER,
     `created_at` DATETIME,
     `updated_at` DATETIME,
     `version` INTEGER DEFAULT 0 NOT NULL,
diff --git a/local/config/schema.xml b/local/config/schema.xml
index a43cfda56..86e313cdf 100755
--- a/local/config/schema.xml
+++ b/local/config/schema.xml
@@ -1,1199 +1,1199 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<database defaultIdMethod="native" name="thelia">
-  <table name="category" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="parent" type="INTEGER" />
-    <column name="visible" required="true" type="TINYINT" />
-    <column name="position" required="true" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-    <behavior name="versionable">
-      <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 defaultValue="0" name="visible" required="true" type="TINYINT" />
-    <column name="position" required="true" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <column name="template_id" required="true" type="INTEGER" />
-    <foreign-key foreignTable="tax_rule" name="fk_product_tax_rule_id" onDelete="SET NULL" onUpdate="RESTRICT">
-      <reference foreign="id" local="tax_rule_id" />
-    </foreign-key>
-    <foreign-key foreignTable="template" name="fk_product_template1">
-      <reference foreign="id" local="template_id" />
-    </foreign-key>
-    <unique name="ref_UNIQUE">
-      <unique-column name="ref" />
-    </unique>
-    <index name="idx_product_tax_rule_id">
-      <index-column name="tax_rule_id" />
-    </index>
-    <index name="fk_product_template_id">
-      <index-column name="template_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-    <behavior name="versionable">
-      <parameter name="log_created_at" value="true" />
-      <parameter name="log_created_by" value="true" />
-    </behavior>
-  </table>
-  <table isCrossRef="true" name="product_category" namespace="Thelia\Model">
-    <column name="product_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="category_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="default_category" type="BOOLEAN" />
-    <foreign-key foreignTable="product" name="fk_product_has_category_product1" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="product_id" />
-    </foreign-key>
-    <foreign-key foreignTable="category" name="fk_product_has_category_category1" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="category_id" />
-    </foreign-key>
-    <index name="idx_product_has_category_category1">
-      <index-column name="category_id" />
-    </index>
-    <index name="idx_product_has_category_product1">
-      <index-column name="product_id" />
-    </index>
-    <index name="idx_product_has_category_default">
-      <index-column name="default_category" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="country" namespace="Thelia\Model">
-    <column name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="area_id" type="INTEGER" />
-    <column name="isocode" required="true" size="4" type="VARCHAR" />
-    <column name="isoalpha2" size="2" type="VARCHAR" />
-    <column name="isoalpha3" size="4" type="VARCHAR" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <column name="by_default" type="TINYINT" />
-    <foreign-key foreignTable="area" name="fk_country_area_id" onDelete="SET NULL" onUpdate="RESTRICT">
-      <reference foreign="id" local="area_id" />
-    </foreign-key>
-    <index name="idx_country_area_id">
-      <index-column name="area_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="tax" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="type" required="true" size="255" type="VARCHAR" />
-    <column name="serialized_requirements" required="true" type="LONGVARCHAR" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="LONGVARCHAR" />
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description" />
-    </behavior>
-  </table>
-  <table name="tax_rule" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="LONGVARCHAR" />
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description" />
-    </behavior>
-  </table>
-  <table name="tax_rule_country" namespace="Thelia\Model">
-    <column name="tax_rule_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="country_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="tax_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="position" required="true" type="INTEGER" />
-    <foreign-key foreignTable="tax" name="fk_tax_rule_country_tax_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="tax_id" />
-    </foreign-key>
-    <foreign-key foreignTable="tax_rule" name="fk_tax_rule_country_tax_rule_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="tax_rule_id" />
-    </foreign-key>
-    <foreign-key foreignTable="country" name="fk_tax_rule_country_country_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="country_id" />
-    </foreign-key>
-    <index name="idx_tax_rule_country_tax_id">
-      <index-column name="tax_id" />
-    </index>
-    <index name="idx_tax_rule_country_tax_rule_id">
-      <index-column name="tax_rule_id" />
-    </index>
-    <index name="idx_tax_rule_country_country_id">
-      <index-column name="country_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="feature" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column defaultValue="0" name="visible" 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" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <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" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="feature" name="fk_feature_av_feature_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="feature_id" />
-    </foreign-key>
-    <index name="idx_feature_av_feature_id">
-      <index-column name="feature_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <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" />
-    <column name="feature_av_id" type="INTEGER" />
-    <column name="by_default" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
-    <foreign-key foreignTable="product" name="fk_feature_prod_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="product_id" />
-    </foreign-key>
-    <foreign-key foreignTable="feature" name="fk_feature_prod_feature_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="feature_id" />
-    </foreign-key>
-    <foreign-key foreignTable="feature_av" name="fk_feature_prod_feature_av_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="feature_av_id" />
-    </foreign-key>
-    <index name="idx_feature_prod_product_id">
-      <index-column name="product_id" />
-    </index>
-    <index name="idx_feature_prod_feature_id">
-      <index-column name="feature_id" />
-    </index>
-    <index name="idx_feature_prod_feature_av_id">
-      <index-column name="feature_av_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table isCrossRef="true" name="feature_template" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="feature_id" required="true" type="INTEGER" />
-    <column name="template_id" required="true" type="INTEGER" />
-    <foreign-key foreignTable="feature" name="fk_feature_template_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="feature_id" />
-    </foreign-key>
-    <foreign-key foreignTable="template" name="fk_feature_template">
-      <reference foreign="id" local="template_id" />
-    </foreign-key>
-    <index name="idx_feature_template_id">
-      <index-column name="feature_id" />
-    </index>
-    <index name="fk_feature_template_idx">
-      <index-column name="template_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="attribute" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <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>
-  </table>
-  <table name="attribute_av" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="attribute_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" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="attribute" name="fk_attribute_av_attribute_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="attribute_id" />
-    </foreign-key>
-    <index name="idx_attribute_av_attribute_id">
-      <index-column name="attribute_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="attribute_combination" namespace="Thelia\Model">
-    <column name="attribute_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="attribute_av_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="product_sale_elements_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">
-      <reference foreign="id" local="attribute_av_id" />
-    </foreign-key>
-    <foreign-key foreignTable="product_sale_elements" name="fk_attribute_combination_product_sale_elements_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="product_sale_elements_id" />
-    </foreign-key>
-    <index name="idx_attribute_combination_attribute_id">
-      <index-column name="attribute_id" />
-    </index>
-    <index name="idx_attribute_combination_attribute_av_id">
-      <index-column name="attribute_av_id" />
-    </index>
-    <index name="idx_attribute_combination_product_sale_elements_id">
-      <index-column name="product_sale_elements_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="product_sale_elements" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="product_id" required="true" type="INTEGER" />
-    <column name="ref" required="true" size="45" type="VARCHAR" />
-    <column name="quantity" required="true" type="FLOAT" />
-    <column defaultValue="0" name="promo" type="TINYINT" />
-    <column defaultValue="0" name="newness" type="TINYINT" />
-    <column name="weight" type="FLOAT" />
-    <foreign-key foreignTable="product" name="fk_product_sale_element_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="product_id" />
-    </foreign-key>
-    <index name="idx_product_sale_element_product_id">
-      <index-column name="product_id" />
-    </index>
-    <unique name="ref_UNIQUE">
-      <unique-column name="ref" />
-    </unique>
-    <behavior name="timestampable" />
-  </table>
-  <table isCrossRef="true" name="attribute_template" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="attribute_id" required="true" type="INTEGER" />
-    <column name="template_id" required="true" type="INTEGER" />
-    <foreign-key foreignTable="attribute" name="fk_attribute_template_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="attribute_id" />
-    </foreign-key>
-    <foreign-key foreignTable="template" name="fk_attribute_template">
-      <reference foreign="id" local="template_id" />
-    </foreign-key>
-    <index name="idx_attribute_template_id">
-      <index-column name="attribute_id" />
-    </index>
-    <index name="fk_attribute_template_idx">
-      <index-column name="template_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="config" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="name" required="true" size="255" type="VARCHAR" />
-    <column name="value" required="true" size="255" type="VARCHAR" />
-    <column defaultValue="1" name="secured" required="true" type="TINYINT" />
-    <column defaultValue="1" name="hidden" required="true" type="TINYINT" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <unique name="name_UNIQUE">
-      <unique-column name="name" />
-    </unique>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="customer" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="ref" required="true" size="50" type="VARCHAR" />
-    <column name="title_id" required="true" type="INTEGER" />
-    <column name="firstname" required="true" size="255" type="VARCHAR" />
-    <column name="lastname" required="true" size="255" type="VARCHAR" />
-    <column name="email" size="50" type="VARCHAR" />
-    <column name="password" size="255" type="VARCHAR" />
-    <column name="algo" size="128" type="VARCHAR" />
-    <column name="reseller" type="TINYINT" />
-    <column name="lang" size="10" type="VARCHAR" />
-    <column name="sponsor" size="50" type="VARCHAR" />
-    <column name="discount" type="FLOAT" />
-    <column name="remember_me_token" size="255" type="VARCHAR" />
-    <column name="remember_me_serial" size="255" type="VARCHAR" />
-    <foreign-key foreignTable="customer_title" name="fk_customer_customer_title_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="title_id" />
-    </foreign-key>
-    <unique name="ref_UNIQUE">
-      <unique-column name="ref" />
-    </unique>
-    <index name="idx_customer_customer_title_id">
-      <index-column name="title_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="address" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="label" size="255" type="VARCHAR" />
-    <column name="customer_id" required="true" type="INTEGER" />
-    <column name="title_id" required="true" type="INTEGER" />
-    <column name="company" size="255" type="VARCHAR" />
-    <column name="firstname" required="true" size="255" type="VARCHAR" />
-    <column name="lastname" required="true" size="255" type="VARCHAR" />
-    <column name="address1" required="true" size="255" type="VARCHAR" />
-    <column name="address2" required="true" size="255" type="VARCHAR" />
-    <column name="address3" required="true" size="255" type="VARCHAR" />
-    <column name="zipcode" required="true" size="10" type="VARCHAR" />
-    <column name="city" required="true" size="255" type="VARCHAR" />
-    <column name="country_id" required="true" type="INTEGER" />
-    <column name="phone" size="20" type="VARCHAR" />
-    <column name="cellphone" size="20" type="VARCHAR" />
-    <column defaultValue="0" name="is_default" type="TINYINT" />
-    <foreign-key foreignTable="customer" name="fk_address_customer_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="customer_id" />
-    </foreign-key>
-    <foreign-key foreignTable="customer_title" name="fk_address_customer_title_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="title_id" />
-    </foreign-key>
-    <foreign-key foreignTable="country" name="fk_address_country_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="country_id" />
-    </foreign-key>
-    <index name="idx_address_customer_id">
-      <index-column name="customer_id" />
-    </index>
-    <index name="idx_address_customer_title_id">
-      <index-column name="title_id" />
-    </index>
-    <index name="idx_address_country_id">
-      <index-column name="country_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="customer_title" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column defaultValue="0" name="by_default" required="true" type="INTEGER" />
-    <column name="position" required="true" size="45" type="VARCHAR" />
-    <column name="short" size="10" type="VARCHAR" />
-    <column name="long" size="45" type="VARCHAR" />
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="short, long" />
-    </behavior>
-  </table>
-  <table name="lang" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="title" size="100" type="VARCHAR" />
-    <column name="code" size="10" type="VARCHAR" />
-    <column name="locale" size="45" type="VARCHAR" />
-    <column name="url" size="255" type="VARCHAR" />
-    <column name="date_format" size="45" type="VARCHAR" />
-    <column name="time_format" size="45" type="VARCHAR" />
-    <column name="datetime_format" size="45" type="VARCHAR" />
-    <column name="decimal_separator" size="45" type="VARCHAR" />
-    <column name="thousands_separator" size="45" type="VARCHAR" />
-    <column name="decimals" size="45" type="VARCHAR" />
-    <column name="by_default" type="TINYINT" />
-    <column name="position" type="INTEGER" />
-    <behavior name="timestampable" />
-  </table>
-  <table name="folder" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="parent" required="true" type="INTEGER" />
-    <column name="visible" type="TINYINT" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <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>
-    <behavior name="versionable">
-      <parameter name="log_created_at" value="true" />
-      <parameter name="log_created_by" value="true" />
-    </behavior>
-  </table>
-  <table name="content" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="visible" type="TINYINT" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <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>
-    <behavior name="versionable">
-      <parameter name="log_created_at" value="true" />
-      <parameter name="log_created_by" value="true" />
-    </behavior>
-  </table>
-  <table name="product_image" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="product_id" required="true" type="INTEGER" />
-    <column name="file" required="true" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="product" name="fk_product_image_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="product_id" />
-    </foreign-key>
-    <index name="idx_product_image_product_id">
-      <index-column name="product_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="product_document" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="product_id" required="true" type="INTEGER" />
-    <column name="file" required="true" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="product" name="fk_product_document_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="product_id" />
-    </foreign-key>
-    <index name="idx_product_document_product_id">
-      <index-column name="product_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="order" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="ref" required="true" size="45" type="VARCHAR" />
-    <column name="customer_id" required="true" type="INTEGER" />
-    <column name="invoice_order_address_id" required="true" type="INTEGER" />
-    <column name="delivery_order_address_id" required="true" type="INTEGER" />
-    <column name="invoice_date" required="true" type="DATE" />
-    <column name="currency_id" required="true" type="INTEGER" />
-    <column name="currency_rate" required="true" type="FLOAT" />
-    <column description="transaction reference - usually use to identify a transaction with banking modules" name="transaction_ref" size="100" type="VARCHAR" />
-    <column description="delivery reference - usually use to identify a delivery progress on a distant delivery tracker website" name="delivery_ref" size="100" type="VARCHAR" />
-    <column description="the invoice reference" name="invoice_ref" size="100" type="VARCHAR" />
-    <column name="postage" required="true" type="FLOAT" />
-    <column name="payment_module_id" required="true" type="INTEGER" />
-    <column name="delivery_module_id" required="true" type="INTEGER" />
-    <column name="status_id" required="true" type="INTEGER" />
-    <column name="lang_id" required="true" type="INTEGER" />
-    <foreign-key foreignTable="currency" name="fk_order_currency_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="currency_id" />
-    </foreign-key>
-    <foreign-key foreignTable="customer" name="fk_order_customer_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="customer_id" />
-    </foreign-key>
-    <foreign-key foreignTable="order_address" name="fk_order_invoice_order_address_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="invoice_order_address_id" />
-    </foreign-key>
-    <foreign-key foreignTable="order_address" name="fk_order_delivery_order_address_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="delivery_order_address_id" />
-    </foreign-key>
-    <foreign-key foreignTable="order_status" name="fk_order_status_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="status_id" />
-    </foreign-key>
-    <foreign-key foreignTable="module" name="fk_order_payment_module_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="payment_module_id" />
-    </foreign-key>
-    <foreign-key foreignTable="module" name="fk_order_delivery_module_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="delivery_module_id" />
-    </foreign-key>
-    <foreign-key foreignTable="lang" name="fk_order_lang_id" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="lang_id" />
-    </foreign-key>
-    <index name="idx_order_currency_id">
-      <index-column name="currency_id" />
-    </index>
-    <index name="idx_order_customer_id">
-      <index-column name="customer_id" />
-    </index>
-    <index name="idx_order_invoice_order_address_id">
-      <index-column name="invoice_order_address_id" />
-    </index>
-    <index name="idx_order_delivery_order_address_id">
-      <index-column name="delivery_order_address_id" />
-    </index>
-    <index name="idx_order_status_id">
-      <index-column name="status_id" />
-    </index>
-    <unique name="ref_UNIQUE">
-      <unique-column name="ref" />
-    </unique>
-    <index name="fk_order_payment_module_id_idx">
-      <index-column name="payment_module_id" />
-    </index>
-    <index name="fk_order_delivery_module_id_idx">
-      <index-column name="delivery_module_id" />
-    </index>
-    <index name="fk_order_lang_id_idx">
-      <index-column name="lang_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="currency" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="name" size="45" type="VARCHAR" />
-    <column name="code" size="45" type="VARCHAR" />
-    <column name="symbol" size="45" type="VARCHAR" />
-    <column name="rate" type="FLOAT" />
-    <column name="position" type="INTEGER" />
-    <column name="by_default" type="TINYINT" />
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="name" />
-    </behavior>
-  </table>
-  <table name="order_address" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="customer_title_id" type="INTEGER" />
-    <column name="company" size="255" type="VARCHAR" />
-    <column name="firstname" required="true" size="255" type="VARCHAR" />
-    <column name="lastname" required="true" size="255" type="VARCHAR" />
-    <column name="address1" required="true" size="255" type="VARCHAR" />
-    <column name="address2" size="255" type="VARCHAR" />
-    <column name="address3" size="255" type="VARCHAR" />
-    <column name="zipcode" required="true" size="10" type="VARCHAR" />
-    <column name="city" required="true" size="255" type="VARCHAR" />
-    <column name="phone" size="20" type="VARCHAR" />
-    <column name="country_id" required="true" type="INTEGER" />
-    <behavior name="timestampable" />
-  </table>
-  <table name="order_product" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="order_id" required="true" type="INTEGER" />
-    <column name="product_ref" size="255" type="VARCHAR" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="LONGVARCHAR" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="quantity" required="true" type="FLOAT" />
-    <column name="price" required="true" type="FLOAT" />
-    <column name="tax" type="FLOAT" />
-    <column name="parent" type="INTEGER" />
-    <foreign-key foreignTable="order" name="fk_order_product_order_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="order_id" />
-    </foreign-key>
-    <index name="idx_order_product_order_id">
-      <index-column name="order_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="order_status" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="code" size="45" type="VARCHAR" />
-    <column name="title" size="255" type="VARCHAR" />
-    <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>
-  </table>
-  <table name="order_feature" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="order_product_id" required="true" type="INTEGER" />
-    <column name="feature_desc" size="255" type="VARCHAR" />
-    <column name="feature_av_desc" size="255" type="VARCHAR" />
-    <foreign-key foreignTable="order_product" name="fk_order_feature_order_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="order_product_id" />
-    </foreign-key>
-    <index name="idx_order_feature_order_product_id">
-      <index-column name="order_product_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="module" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="code" required="true" size="55" type="VARCHAR" />
-    <column name="type" required="true" type="TINYINT" />
-    <column name="activate" type="TINYINT" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <column name="full_namespace" size="255" type="VARCHAR" />
-    <unique name="code_UNIQUE">
-      <unique-column name="code" />
-    </unique>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table isCrossRef="true" name="accessory" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="product_id" required="true" type="INTEGER" />
-    <column name="accessory" required="true" type="INTEGER" />
-    <column name="position" required="true" type="INTEGER" />
-    <foreign-key foreignTable="product" name="fk_accessory_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="product_id" />
-    </foreign-key>
-    <foreign-key foreignTable="product" name="fk_accessory_accessory" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="accessory" />
-    </foreign-key>
-    <index name="idx_address_product_id">
-      <index-column name="product_id" />
-    </index>
-    <index name="idx_address_accessory">
-      <index-column name="accessory" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="area" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="name" required="true" size="100" type="VARCHAR" />
-    <column name="postage" type="FLOAT" />
-    <behavior name="timestampable" />
-  </table>
-  <table name="area_delivery_module" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="area_id" required="true" type="INTEGER" />
-    <column name="delivery_module_id" required="true" type="INTEGER" />
-    <foreign-key foreignTable="area" name="fk_area_delivery_module_area_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="area_id" />
-    </foreign-key>
-    <foreign-key foreignTable="module" name="idx_area_delivery_module_delivery_module_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="delivery_module_id" />
-    </foreign-key>
-    <index name="idx_area_delivery_module_area_id">
-      <index-column name="area_id" />
-    </index>
-    <index name="idx_area_delivery_module_delivery_module_id_idx">
-      <index-column name="delivery_module_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="group" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="code" required="true" size="30" type="VARCHAR" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <unique name="code_UNIQUE">
-      <unique-column name="code" />
-    </unique>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="resource" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="code" required="true" size="30" type="VARCHAR" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <unique name="code_UNIQUE">
-      <unique-column name="code" />
-    </unique>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="admin" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="firstname" required="true" size="100" type="VARCHAR" />
-    <column name="lastname" required="true" size="100" type="VARCHAR" />
-    <column name="login" required="true" size="100" type="VARCHAR" />
-    <column name="password" required="true" size="128" type="VARCHAR" />
-    <column name="algo" size="128" type="VARCHAR" />
-    <column name="salt" size="128" type="VARCHAR" />
-    <column name="remember_me_token" size="255" type="VARCHAR" />
-    <column name="remember_me_serial" size="255" type="VARCHAR" />
-    <behavior name="timestampable" />
-  </table>
-  <table isCrossRef="true" name="admin_group" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="group_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="admin_id" primaryKey="true" required="true" type="INTEGER" />
-    <foreign-key foreignTable="group" name="fk_admin_group_group_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="group_id" />
-    </foreign-key>
-    <foreign-key foreignTable="admin" name="fk_admin_group_admin_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="admin_id" />
-    </foreign-key>
-    <index name="idx_admin_group_group_id">
-      <index-column name="group_id" />
-    </index>
-    <index name="idx_admin_group_admin_id">
-      <index-column name="admin_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table isCrossRef="true" name="group_resource" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="group_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="resource_id" primaryKey="true" required="true" type="INTEGER" />
-    <column defaultValue="0" name="read" type="TINYINT" />
-    <column defaultValue="0" name="write" type="TINYINT" />
-    <foreign-key foreignTable="group" name="fk_group_resource_group_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="group_id" />
-    </foreign-key>
-    <foreign-key foreignTable="resource" name="fk_group_resource_resource_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="resource_id" />
-    </foreign-key>
-    <index name="id_group_resource_group_id">
-      <index-column name="group_id" />
-    </index>
-    <index name="idx_group_resource_resource_id">
-      <index-column name="resource_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="group_module" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="group_id" required="true" type="INTEGER" />
-    <column name="module_id" type="INTEGER" />
-    <column defaultValue="0" name="access" type="TINYINT" />
-    <foreign-key foreignTable="group" name="fk_group_module_group_id" onDelete="CASCADE" onUpdate="CASCADE">
-      <reference foreign="id" local="group_id" />
-    </foreign-key>
-    <foreign-key foreignTable="module" name="fk_group_module_module_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="module_id" />
-    </foreign-key>
-    <index name="idx_group_module_group_id">
-      <index-column name="group_id" />
-    </index>
-    <index name="idx_group_module_module_id">
-      <index-column name="module_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="message" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="name" required="true" size="255" type="VARCHAR" />
-    <column name="secured" type="TINYINT" />
-    <column name="title" type="LONGVARCHAR" />
-    <column name="subject" type="LONGVARCHAR" />
-    <column name="text_message" type="CLOB" />
-    <column name="html_message" type="CLOB" />
-    <unique name="name_UNIQUE">
-      <unique-column name="name" />
-    </unique>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, subject, text_message, html_message" />
-    </behavior>
-    <behavior name="versionable">
-      <parameter name="log_created_at" value="true" />
-      <parameter name="log_created_by" value="true" />
-    </behavior>
-  </table>
-  <table name="coupon" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="code" required="true" size="45" type="VARCHAR" />
-    <column name="type" required="true" size="255" type="VARCHAR" />
-    <column name="title" required="true" size="255" type="VARCHAR" />
-    <column name="short_description" required="true" type="LONGVARCHAR" />
-    <column name="description" required="true" type="CLOB" />
-    <column name="amount" required="true" type="FLOAT" />
-    <column name="is_used" required="true" type="TINYINT" />
-    <column name="is_enabled" required="true" type="TINYINT" />
-    <column name="expiration_date" required="true" type="TIMESTAMP" />
-    <column name="serialized_rules" required="true" type="LONGVARCHAR" />
-    <column name="is_cumulative" required="true" type="TINYINT" />
-    <column name="is_removing_postage" required="true" type="TINYINT" />
-    <column name="max_usage" required="true" type="INTEGER" />
-    <column name="is_available_on_special_offers" required="true" type="BOOLEAN" />
-    <unique name="code_UNIQUE">
-      <unique-column name="code" />
-    </unique>
-    <index name="idx_is_enabled">
-      <index-column name="is_enabled" />
-    </index>
-    <index name="idx_is_used">
-      <index-column name="is_used" />
-    </index>
-    <index name="idx_type">
-      <index-column name="type" />
-    </index>
-    <index name="idx_amount">
-      <index-column name="amount" />
-    </index>
-    <index name="idx_expiration_date">
-      <index-column name="expiration_date" />
-    </index>
-    <index name="idx_is_cumulative">
-      <index-column name="is_cumulative" />
-    </index>
-    <index name="idx_is_removing_postage">
-      <index-column name="is_removing_postage" />
-    </index>
-    <index name="idx_max_usage">
-      <index-column name="max_usage" />
-    </index>
-    <index name="idx_is_available_on_special_offers">
-      <index-column name="is_available_on_special_offers" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, short_description, description" />
-    </behavior>
-    <behavior name="versionable" />
-  </table>
-  <table name="coupon_order" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="order_id" required="true" type="INTEGER" />
-    <column name="value" required="true" type="FLOAT" />
-    <foreign-key foreignTable="order" name="fk_coupon_order_order_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="order_id" />
-    </foreign-key>
-    <index name="idx_coupon_order_order_id">
-      <index-column name="order_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="admin_log" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="admin_login" size="255" type="VARCHAR" />
-    <column name="admin_firstname" size="255" type="VARCHAR" />
-    <column name="admin_lastname" size="255" type="VARCHAR" />
-    <column name="action" size="255" type="VARCHAR" />
-    <column name="request" type="LONGVARCHAR" />
-    <behavior name="timestampable" />
-  </table>
-  <table isCrossRef="true" name="content_folder" namespace="Thelia\Model">
-    <column name="content_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="folder_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="default_folder" type="BOOLEAN" />
-    <foreign-key foreignTable="content" name="fk_content_folder_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="content_id" />
-    </foreign-key>
-    <foreign-key foreignTable="folder" name="fk_content_folder_folder_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="folder_id" />
-    </foreign-key>
-    <index name="idx_content_folder_content_id">
-      <index-column name="content_id" />
-    </index>
-    <index name="idx_content_folder_folder_id">
-      <index-column name="folder_id" />
-    </index>
-    <index name="idx_content_folder_default">
-      <index-column name="default_folder" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="cart" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="token" size="255" type="VARCHAR" />
-    <column name="customer_id" type="INTEGER" />
-    <column name="address_delivery_id" type="INTEGER" />
-    <column name="address_invoice_id" type="INTEGER" />
-    <column name="currency_id" type="INTEGER" />
-    <column defaultValue="0" name="discount" type="FLOAT" />
-    <foreign-key foreignTable="customer" name="fk_cart_customer_id">
-      <reference foreign="id" local="customer_id" />
-    </foreign-key>
-    <foreign-key foreignTable="address" name="fk_cart_address_delivery_id">
-      <reference foreign="id" local="address_delivery_id" />
-    </foreign-key>
-    <foreign-key foreignTable="address" name="fk_cart_address_invoice_id">
-      <reference foreign="id" local="address_invoice_id" />
-    </foreign-key>
-    <foreign-key foreignTable="currency" name="fk_cart_currency_id">
-      <reference foreign="id" local="currency_id" />
-    </foreign-key>
-    <index name="idx_cart_customer_id">
-      <index-column name="customer_id" />
-    </index>
-    <index name="idx_cart_address_delivery_id">
-      <index-column name="address_delivery_id" />
-    </index>
-    <index name="idx_cart_address_invoice_id">
-      <index-column name="address_invoice_id" />
-    </index>
-    <index name="idx_cart_currency_id">
-      <index-column name="currency_id" />
-    </index>
-    <unique name="token_UNIQUE">
-      <unique-column name="token" />
-    </unique>
-    <behavior name="timestampable" />
-  </table>
-  <table name="cart_item" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <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="product_sale_elements_id" required="true" type="INTEGER" />
-    <column name="price" type="FLOAT" />
-    <column name="promo_price" type="FLOAT" />
-    <column name="price_end_of_life" type="TIMESTAMP" />
-    <column defaultValue="0" name="discount" type="FLOAT" />
-    <column name="promo" 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="product_sale_elements" name="fk_cart_item_product_sale_elements_id">
-      <reference foreign="id" local="product_sale_elements_id" />
-    </foreign-key>
-    <index name="idx_cart_item_cart_id">
-      <index-column name="cart_id" />
-    </index>
-    <index name="idx_cart_item_product_id">
-      <index-column name="product_id" />
-    </index>
-    <index name="idx_cart_item_product_sale_elements_id">
-      <index-column name="product_sale_elements_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="product_price" namespace="Thelia\Model">
-    <column name="product_sale_elements_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="currency_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="price" required="true" type="FLOAT" />
-    <column name="promo_price" type="FLOAT" />
-    <foreign-key foreignTable="product_sale_elements" name="fk_product_price_product_sale_elements_id" onDelete="CASCADE">
-      <reference foreign="id" local="product_sale_elements_id" />
-    </foreign-key>
-    <foreign-key foreignTable="currency" name="fk_product_price_currency_id" onDelete="CASCADE">
-      <reference foreign="id" local="currency_id" />
-    </foreign-key>
-    <index name="idx_product_price_product_sale_elements_id">
-      <index-column name="product_sale_elements_id" />
-    </index>
-    <index name="idx_product_price_currency_id">
-      <index-column name="currency_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="category_image" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="category_id" required="true" type="INTEGER" />
-    <column name="file" required="true" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="category" name="fk_category_image_category_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="category_id" />
-    </foreign-key>
-    <index name="idx_category_image_category_id">
-      <index-column name="category_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="folder_image" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="folder_id" required="true" type="INTEGER" />
-    <column name="file" required="true" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="folder" name="fk_folder_image_folder_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="folder_id" />
-    </foreign-key>
-    <index name="idx_folder_image_folder_id">
-      <index-column name="folder_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="content_image" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="content_id" required="true" type="INTEGER" />
-    <column name="file" required="true" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="content" name="fk_content_image_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="content_id" />
-    </foreign-key>
-    <index name="idx_content_image_content_id">
-      <index-column name="content_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="category_document" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="category_id" required="true" type="INTEGER" />
-    <column name="file" required="true" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="category" name="fk_catgory_document_category_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="category_id" />
-    </foreign-key>
-    <index name="idx_category_document_category_id">
-      <index-column name="category_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="content_document" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="content_id" required="true" type="INTEGER" />
-    <column name="file" required="true" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="content" name="fk_content_document_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="content_id" />
-    </foreign-key>
-    <index name="idx_content_document_content_id">
-      <index-column name="content_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="folder_document" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="folder_id" required="true" type="INTEGER" />
-    <column name="file" required="true" size="255" type="VARCHAR" />
-    <column name="position" type="INTEGER" />
-    <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="CLOB" />
-    <column name="chapo" type="LONGVARCHAR" />
-    <column name="postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="folder" name="fk_folder_document_folder_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="folder_id" />
-    </foreign-key>
-    <index name="idx_folder_document_folder_id">
-      <index-column name="folder_id" />
-    </index>
-    <behavior name="timestampable" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
-    </behavior>
-  </table>
-  <table name="product_associated_content" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="product_id" required="true" type="INTEGER" />
-    <column name="content_id" required="true" type="INTEGER" />
-    <column name="position" required="true" type="INTEGER" />
-    <foreign-key foreignTable="product" name="fk_product_associated_content_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="product_id" />
-    </foreign-key>
-    <foreign-key foreignTable="content" name="fk_product_associated_content_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="content_id" />
-    </foreign-key>
-    <index name="idx_product_associated_content_product_id">
-      <index-column name="product_id" />
-    </index>
-    <index name="idx_product_associated_content_content_id">
-      <index-column name="content_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="category_associated_content" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="category_id" required="true" type="INTEGER" />
-    <column name="content_id" required="true" type="INTEGER" />
-    <column name="position" required="true" type="INTEGER" />
-    <foreign-key foreignTable="category" name="fk_category_associated_content_category_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="category_id" />
-    </foreign-key>
-    <foreign-key foreignTable="content" name="fk_category_associated_content_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="content_id" />
-    </foreign-key>
-    <index name="idx_category_associated_content_category_id">
-      <index-column name="category_id" />
-    </index>
-    <index name="idx_category_associated_content_content_id">
-      <index-column name="content_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="rewriting_url" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="url" required="true" size="255" type="VARCHAR" />
-    <column name="view" size="255" type="VARCHAR" />
-    <column name="view_id" size="255" type="VARCHAR" />
-    <column name="view_locale" size="255" type="VARCHAR" />
-    <column name="redirected" type="INTEGER" />
-    <foreign-key foreignTable="rewriting_url" name="fk_rewriting_url_redirected" onDelete="RESTRICT" onUpdate="RESTRICT">
-      <reference foreign="id" local="redirected" />
-    </foreign-key>
-    <unique name="url_UNIQUE">
-      <unique-column name="url" />
-    </unique>
-    <index name="idx_view_id">
-      <index-column name="view_id" />
-    </index>
-    <index name="idx_rewriting_url_redirected">
-      <index-column name="redirected" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="rewriting_argument" namespace="Thelia\Model">
-    <column name="rewriting_url_id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="parameter" primaryKey="true" required="true" size="255" type="VARCHAR" />
-    <column name="value" primaryKey="true" required="true" size="255" type="VARCHAR" />
-    <foreign-key foreignTable="rewriting_url" name="fk_rewriting_argument_rewirting_url_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="rewriting_url_id" />
-    </foreign-key>
-    <index name="idx_rewriting_argument_rewirting_url_id">
-      <index-column name="rewriting_url_id" />
-    </index>
-    <behavior name="timestampable" />
-  </table>
-  <table name="template" namespace="Thelia\Model">
-    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="name" size="255" type="VARCHAR" />
-    <behavior name="i18n">
-      <parameter name="i18n_columns" value="name" />
-    </behavior>
-    <behavior name="timestampable" />
-  </table>
-</database>
+<?xml version="1.0" encoding="UTF-8"?>
+<database defaultIdMethod="native" name="thelia">
+  <table name="category" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="parent" type="INTEGER" />
+    <column name="visible" required="true" type="TINYINT" />
+    <column name="position" required="true" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+    <behavior name="versionable">
+      <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 defaultValue="0" name="visible" required="true" type="TINYINT" />
+    <column name="position" required="true" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <column name="template_id" type="INTEGER" />
+    <foreign-key foreignTable="tax_rule" name="fk_product_tax_rule_id" onDelete="SET NULL" onUpdate="RESTRICT">
+      <reference foreign="id" local="tax_rule_id" />
+    </foreign-key>
+    <foreign-key foreignTable="template" name="fk_product_template1">
+      <reference foreign="id" local="template_id" />
+    </foreign-key>
+    <unique name="ref_UNIQUE">
+      <unique-column name="ref" />
+    </unique>
+    <index name="idx_product_tax_rule_id">
+      <index-column name="tax_rule_id" />
+    </index>
+    <index name="fk_product_template_id">
+      <index-column name="template_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+    <behavior name="versionable">
+      <parameter name="log_created_at" value="true" />
+      <parameter name="log_created_by" value="true" />
+    </behavior>
+  </table>
+  <table isCrossRef="true" name="product_category" namespace="Thelia\Model">
+    <column name="product_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="category_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="default_category" type="BOOLEAN" />
+    <foreign-key foreignTable="product" name="fk_product_has_category_product1" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="product_id" />
+    </foreign-key>
+    <foreign-key foreignTable="category" name="fk_product_has_category_category1" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="category_id" />
+    </foreign-key>
+    <index name="idx_product_has_category_category1">
+      <index-column name="category_id" />
+    </index>
+    <index name="idx_product_has_category_product1">
+      <index-column name="product_id" />
+    </index>
+    <index name="idx_product_has_category_default">
+      <index-column name="default_category" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="country" namespace="Thelia\Model">
+    <column name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="area_id" type="INTEGER" />
+    <column name="isocode" required="true" size="4" type="VARCHAR" />
+    <column name="isoalpha2" size="2" type="VARCHAR" />
+    <column name="isoalpha3" size="4" type="VARCHAR" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <column name="by_default" type="TINYINT" />
+    <foreign-key foreignTable="area" name="fk_country_area_id" onDelete="SET NULL" onUpdate="RESTRICT">
+      <reference foreign="id" local="area_id" />
+    </foreign-key>
+    <index name="idx_country_area_id">
+      <index-column name="area_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="tax" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="type" required="true" size="255" type="VARCHAR" />
+    <column name="serialized_requirements" required="true" type="LONGVARCHAR" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="LONGVARCHAR" />
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description" />
+    </behavior>
+  </table>
+  <table name="tax_rule" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="LONGVARCHAR" />
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description" />
+    </behavior>
+  </table>
+  <table name="tax_rule_country" namespace="Thelia\Model">
+    <column name="tax_rule_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="country_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="tax_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="position" required="true" type="INTEGER" />
+    <foreign-key foreignTable="tax" name="fk_tax_rule_country_tax_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="tax_id" />
+    </foreign-key>
+    <foreign-key foreignTable="tax_rule" name="fk_tax_rule_country_tax_rule_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="tax_rule_id" />
+    </foreign-key>
+    <foreign-key foreignTable="country" name="fk_tax_rule_country_country_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="country_id" />
+    </foreign-key>
+    <index name="idx_tax_rule_country_tax_id">
+      <index-column name="tax_id" />
+    </index>
+    <index name="idx_tax_rule_country_tax_rule_id">
+      <index-column name="tax_rule_id" />
+    </index>
+    <index name="idx_tax_rule_country_country_id">
+      <index-column name="country_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="feature" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column defaultValue="0" name="visible" 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" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <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" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="feature" name="fk_feature_av_feature_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="feature_id" />
+    </foreign-key>
+    <index name="idx_feature_av_feature_id">
+      <index-column name="feature_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <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" />
+    <column name="feature_av_id" type="INTEGER" />
+    <column name="by_default" size="255" type="VARCHAR" />
+    <column name="position" type="INTEGER" />
+    <foreign-key foreignTable="product" name="fk_feature_prod_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="product_id" />
+    </foreign-key>
+    <foreign-key foreignTable="feature" name="fk_feature_prod_feature_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="feature_id" />
+    </foreign-key>
+    <foreign-key foreignTable="feature_av" name="fk_feature_prod_feature_av_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="feature_av_id" />
+    </foreign-key>
+    <index name="idx_feature_prod_product_id">
+      <index-column name="product_id" />
+    </index>
+    <index name="idx_feature_prod_feature_id">
+      <index-column name="feature_id" />
+    </index>
+    <index name="idx_feature_prod_feature_av_id">
+      <index-column name="feature_av_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table isCrossRef="true" name="feature_template" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="feature_id" required="true" type="INTEGER" />
+    <column name="template_id" required="true" type="INTEGER" />
+    <foreign-key foreignTable="feature" name="fk_feature_template_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="feature_id" />
+    </foreign-key>
+    <foreign-key foreignTable="template" name="fk_feature_template">
+      <reference foreign="id" local="template_id" />
+    </foreign-key>
+    <index name="idx_feature_template_id">
+      <index-column name="feature_id" />
+    </index>
+    <index name="fk_feature_template_idx">
+      <index-column name="template_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="attribute" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <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>
+  </table>
+  <table name="attribute_av" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="attribute_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" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="attribute" name="fk_attribute_av_attribute_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="attribute_id" />
+    </foreign-key>
+    <index name="idx_attribute_av_attribute_id">
+      <index-column name="attribute_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="attribute_combination" namespace="Thelia\Model">
+    <column name="attribute_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="attribute_av_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="product_sale_elements_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">
+      <reference foreign="id" local="attribute_av_id" />
+    </foreign-key>
+    <foreign-key foreignTable="product_sale_elements" name="fk_attribute_combination_product_sale_elements_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="product_sale_elements_id" />
+    </foreign-key>
+    <index name="idx_attribute_combination_attribute_id">
+      <index-column name="attribute_id" />
+    </index>
+    <index name="idx_attribute_combination_attribute_av_id">
+      <index-column name="attribute_av_id" />
+    </index>
+    <index name="idx_attribute_combination_product_sale_elements_id">
+      <index-column name="product_sale_elements_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="product_sale_elements" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="product_id" required="true" type="INTEGER" />
+    <column name="ref" required="true" size="45" type="VARCHAR" />
+    <column name="quantity" required="true" type="FLOAT" />
+    <column defaultValue="0" name="promo" type="TINYINT" />
+    <column defaultValue="0" name="newness" type="TINYINT" />
+    <column name="weight" type="FLOAT" />
+    <foreign-key foreignTable="product" name="fk_product_sale_element_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="product_id" />
+    </foreign-key>
+    <index name="idx_product_sale_element_product_id">
+      <index-column name="product_id" />
+    </index>
+    <unique name="ref_UNIQUE">
+      <unique-column name="ref" />
+    </unique>
+    <behavior name="timestampable" />
+  </table>
+  <table isCrossRef="true" name="attribute_template" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="attribute_id" required="true" type="INTEGER" />
+    <column name="template_id" required="true" type="INTEGER" />
+    <foreign-key foreignTable="attribute" name="fk_attribute_template_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="attribute_id" />
+    </foreign-key>
+    <foreign-key foreignTable="template" name="fk_attribute_template">
+      <reference foreign="id" local="template_id" />
+    </foreign-key>
+    <index name="idx_attribute_template_id">
+      <index-column name="attribute_id" />
+    </index>
+    <index name="fk_attribute_template_idx">
+      <index-column name="template_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="config" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="name" required="true" size="255" type="VARCHAR" />
+    <column name="value" required="true" size="255" type="VARCHAR" />
+    <column defaultValue="1" name="secured" required="true" type="TINYINT" />
+    <column defaultValue="1" name="hidden" required="true" type="TINYINT" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <unique name="name_UNIQUE">
+      <unique-column name="name" />
+    </unique>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="customer" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="ref" required="true" size="50" type="VARCHAR" />
+    <column name="title_id" required="true" type="INTEGER" />
+    <column name="firstname" required="true" size="255" type="VARCHAR" />
+    <column name="lastname" required="true" size="255" type="VARCHAR" />
+    <column name="email" size="50" type="VARCHAR" />
+    <column name="password" size="255" type="VARCHAR" />
+    <column name="algo" size="128" type="VARCHAR" />
+    <column name="reseller" type="TINYINT" />
+    <column name="lang" size="10" type="VARCHAR" />
+    <column name="sponsor" size="50" type="VARCHAR" />
+    <column name="discount" type="FLOAT" />
+    <column name="remember_me_token" size="255" type="VARCHAR" />
+    <column name="remember_me_serial" size="255" type="VARCHAR" />
+    <foreign-key foreignTable="customer_title" name="fk_customer_customer_title_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="title_id" />
+    </foreign-key>
+    <unique name="ref_UNIQUE">
+      <unique-column name="ref" />
+    </unique>
+    <index name="idx_customer_customer_title_id">
+      <index-column name="title_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="address" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="label" size="255" type="VARCHAR" />
+    <column name="customer_id" required="true" type="INTEGER" />
+    <column name="title_id" required="true" type="INTEGER" />
+    <column name="company" size="255" type="VARCHAR" />
+    <column name="firstname" required="true" size="255" type="VARCHAR" />
+    <column name="lastname" required="true" size="255" type="VARCHAR" />
+    <column name="address1" required="true" size="255" type="VARCHAR" />
+    <column name="address2" required="true" size="255" type="VARCHAR" />
+    <column name="address3" required="true" size="255" type="VARCHAR" />
+    <column name="zipcode" required="true" size="10" type="VARCHAR" />
+    <column name="city" required="true" size="255" type="VARCHAR" />
+    <column name="country_id" required="true" type="INTEGER" />
+    <column name="phone" size="20" type="VARCHAR" />
+    <column name="cellphone" size="20" type="VARCHAR" />
+    <column defaultValue="0" name="is_default" type="TINYINT" />
+    <foreign-key foreignTable="customer" name="fk_address_customer_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="customer_id" />
+    </foreign-key>
+    <foreign-key foreignTable="customer_title" name="fk_address_customer_title_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="title_id" />
+    </foreign-key>
+    <foreign-key foreignTable="country" name="fk_address_country_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="country_id" />
+    </foreign-key>
+    <index name="idx_address_customer_id">
+      <index-column name="customer_id" />
+    </index>
+    <index name="idx_address_customer_title_id">
+      <index-column name="title_id" />
+    </index>
+    <index name="idx_address_country_id">
+      <index-column name="country_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="customer_title" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column defaultValue="0" name="by_default" required="true" type="INTEGER" />
+    <column name="position" required="true" size="45" type="VARCHAR" />
+    <column name="short" size="10" type="VARCHAR" />
+    <column name="long" size="45" type="VARCHAR" />
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="short, long" />
+    </behavior>
+  </table>
+  <table name="lang" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="title" size="100" type="VARCHAR" />
+    <column name="code" size="10" type="VARCHAR" />
+    <column name="locale" size="45" type="VARCHAR" />
+    <column name="url" size="255" type="VARCHAR" />
+    <column name="date_format" size="45" type="VARCHAR" />
+    <column name="time_format" size="45" type="VARCHAR" />
+    <column name="datetime_format" size="45" type="VARCHAR" />
+    <column name="decimal_separator" size="45" type="VARCHAR" />
+    <column name="thousands_separator" size="45" type="VARCHAR" />
+    <column name="decimals" size="45" type="VARCHAR" />
+    <column name="by_default" type="TINYINT" />
+    <column name="position" type="INTEGER" />
+    <behavior name="timestampable" />
+  </table>
+  <table name="folder" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="parent" required="true" type="INTEGER" />
+    <column name="visible" type="TINYINT" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <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>
+    <behavior name="versionable">
+      <parameter name="log_created_at" value="true" />
+      <parameter name="log_created_by" value="true" />
+    </behavior>
+  </table>
+  <table name="content" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="visible" type="TINYINT" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <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>
+    <behavior name="versionable">
+      <parameter name="log_created_at" value="true" />
+      <parameter name="log_created_by" value="true" />
+    </behavior>
+  </table>
+  <table name="product_image" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="product_id" required="true" type="INTEGER" />
+    <column name="file" required="true" size="255" type="VARCHAR" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="product" name="fk_product_image_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="product_id" />
+    </foreign-key>
+    <index name="idx_product_image_product_id">
+      <index-column name="product_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="product_document" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="product_id" required="true" type="INTEGER" />
+    <column name="file" required="true" size="255" type="VARCHAR" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="product" name="fk_product_document_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="product_id" />
+    </foreign-key>
+    <index name="idx_product_document_product_id">
+      <index-column name="product_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="order" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="ref" required="true" size="45" type="VARCHAR" />
+    <column name="customer_id" required="true" type="INTEGER" />
+    <column name="invoice_order_address_id" required="true" type="INTEGER" />
+    <column name="delivery_order_address_id" required="true" type="INTEGER" />
+    <column name="invoice_date" required="true" type="DATE" />
+    <column name="currency_id" required="true" type="INTEGER" />
+    <column name="currency_rate" required="true" type="FLOAT" />
+    <column description="transaction reference - usually use to identify a transaction with banking modules" name="transaction_ref" size="100" type="VARCHAR" />
+    <column description="delivery reference - usually use to identify a delivery progress on a distant delivery tracker website" name="delivery_ref" size="100" type="VARCHAR" />
+    <column description="the invoice reference" name="invoice_ref" size="100" type="VARCHAR" />
+    <column name="postage" required="true" type="FLOAT" />
+    <column name="payment_module_id" required="true" type="INTEGER" />
+    <column name="delivery_module_id" required="true" type="INTEGER" />
+    <column name="status_id" required="true" type="INTEGER" />
+    <column name="lang_id" required="true" type="INTEGER" />
+    <foreign-key foreignTable="currency" name="fk_order_currency_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="currency_id" />
+    </foreign-key>
+    <foreign-key foreignTable="customer" name="fk_order_customer_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="customer_id" />
+    </foreign-key>
+    <foreign-key foreignTable="order_address" name="fk_order_invoice_order_address_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="invoice_order_address_id" />
+    </foreign-key>
+    <foreign-key foreignTable="order_address" name="fk_order_delivery_order_address_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="delivery_order_address_id" />
+    </foreign-key>
+    <foreign-key foreignTable="order_status" name="fk_order_status_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="status_id" />
+    </foreign-key>
+    <foreign-key foreignTable="module" name="fk_order_payment_module_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="payment_module_id" />
+    </foreign-key>
+    <foreign-key foreignTable="module" name="fk_order_delivery_module_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="delivery_module_id" />
+    </foreign-key>
+    <foreign-key foreignTable="lang" name="fk_order_lang_id" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="lang_id" />
+    </foreign-key>
+    <index name="idx_order_currency_id">
+      <index-column name="currency_id" />
+    </index>
+    <index name="idx_order_customer_id">
+      <index-column name="customer_id" />
+    </index>
+    <index name="idx_order_invoice_order_address_id">
+      <index-column name="invoice_order_address_id" />
+    </index>
+    <index name="idx_order_delivery_order_address_id">
+      <index-column name="delivery_order_address_id" />
+    </index>
+    <index name="idx_order_status_id">
+      <index-column name="status_id" />
+    </index>
+    <unique name="ref_UNIQUE">
+      <unique-column name="ref" />
+    </unique>
+    <index name="fk_order_payment_module_id_idx">
+      <index-column name="payment_module_id" />
+    </index>
+    <index name="fk_order_delivery_module_id_idx">
+      <index-column name="delivery_module_id" />
+    </index>
+    <index name="fk_order_lang_id_idx">
+      <index-column name="lang_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="currency" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="name" size="45" type="VARCHAR" />
+    <column name="code" size="45" type="VARCHAR" />
+    <column name="symbol" size="45" type="VARCHAR" />
+    <column name="rate" type="FLOAT" />
+    <column name="position" type="INTEGER" />
+    <column name="by_default" type="TINYINT" />
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="name" />
+    </behavior>
+  </table>
+  <table name="order_address" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="customer_title_id" type="INTEGER" />
+    <column name="company" size="255" type="VARCHAR" />
+    <column name="firstname" required="true" size="255" type="VARCHAR" />
+    <column name="lastname" required="true" size="255" type="VARCHAR" />
+    <column name="address1" required="true" size="255" type="VARCHAR" />
+    <column name="address2" size="255" type="VARCHAR" />
+    <column name="address3" size="255" type="VARCHAR" />
+    <column name="zipcode" required="true" size="10" type="VARCHAR" />
+    <column name="city" required="true" size="255" type="VARCHAR" />
+    <column name="phone" size="20" type="VARCHAR" />
+    <column name="country_id" required="true" type="INTEGER" />
+    <behavior name="timestampable" />
+  </table>
+  <table name="order_product" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="order_id" required="true" type="INTEGER" />
+    <column name="product_ref" size="255" type="VARCHAR" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="LONGVARCHAR" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="quantity" required="true" type="FLOAT" />
+    <column name="price" required="true" type="FLOAT" />
+    <column name="tax" type="FLOAT" />
+    <column name="parent" type="INTEGER" />
+    <foreign-key foreignTable="order" name="fk_order_product_order_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="order_id" />
+    </foreign-key>
+    <index name="idx_order_product_order_id">
+      <index-column name="order_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="order_status" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="code" size="45" type="VARCHAR" />
+    <column name="title" size="255" type="VARCHAR" />
+    <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>
+  </table>
+  <table name="order_feature" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="order_product_id" required="true" type="INTEGER" />
+    <column name="feature_desc" size="255" type="VARCHAR" />
+    <column name="feature_av_desc" size="255" type="VARCHAR" />
+    <foreign-key foreignTable="order_product" name="fk_order_feature_order_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="order_product_id" />
+    </foreign-key>
+    <index name="idx_order_feature_order_product_id">
+      <index-column name="order_product_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="module" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="code" required="true" size="55" type="VARCHAR" />
+    <column name="type" required="true" type="TINYINT" />
+    <column name="activate" type="TINYINT" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <column name="full_namespace" size="255" type="VARCHAR" />
+    <unique name="code_UNIQUE">
+      <unique-column name="code" />
+    </unique>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table isCrossRef="true" name="accessory" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="product_id" required="true" type="INTEGER" />
+    <column name="accessory" required="true" type="INTEGER" />
+    <column name="position" required="true" type="INTEGER" />
+    <foreign-key foreignTable="product" name="fk_accessory_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="product_id" />
+    </foreign-key>
+    <foreign-key foreignTable="product" name="fk_accessory_accessory" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="accessory" />
+    </foreign-key>
+    <index name="idx_address_product_id">
+      <index-column name="product_id" />
+    </index>
+    <index name="idx_address_accessory">
+      <index-column name="accessory" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="area" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="name" required="true" size="100" type="VARCHAR" />
+    <column name="postage" type="FLOAT" />
+    <behavior name="timestampable" />
+  </table>
+  <table name="area_delivery_module" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="area_id" required="true" type="INTEGER" />
+    <column name="delivery_module_id" required="true" type="INTEGER" />
+    <foreign-key foreignTable="area" name="fk_area_delivery_module_area_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="area_id" />
+    </foreign-key>
+    <foreign-key foreignTable="module" name="idx_area_delivery_module_delivery_module_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="delivery_module_id" />
+    </foreign-key>
+    <index name="idx_area_delivery_module_area_id">
+      <index-column name="area_id" />
+    </index>
+    <index name="idx_area_delivery_module_delivery_module_id_idx">
+      <index-column name="delivery_module_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="group" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="code" required="true" size="30" type="VARCHAR" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <unique name="code_UNIQUE">
+      <unique-column name="code" />
+    </unique>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="resource" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="code" required="true" size="30" type="VARCHAR" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <unique name="code_UNIQUE">
+      <unique-column name="code" />
+    </unique>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="admin" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="firstname" required="true" size="100" type="VARCHAR" />
+    <column name="lastname" required="true" size="100" type="VARCHAR" />
+    <column name="login" required="true" size="100" type="VARCHAR" />
+    <column name="password" required="true" size="128" type="VARCHAR" />
+    <column name="algo" size="128" type="VARCHAR" />
+    <column name="salt" size="128" type="VARCHAR" />
+    <column name="remember_me_token" size="255" type="VARCHAR" />
+    <column name="remember_me_serial" size="255" type="VARCHAR" />
+    <behavior name="timestampable" />
+  </table>
+  <table isCrossRef="true" name="admin_group" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="group_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="admin_id" primaryKey="true" required="true" type="INTEGER" />
+    <foreign-key foreignTable="group" name="fk_admin_group_group_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="group_id" />
+    </foreign-key>
+    <foreign-key foreignTable="admin" name="fk_admin_group_admin_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="admin_id" />
+    </foreign-key>
+    <index name="idx_admin_group_group_id">
+      <index-column name="group_id" />
+    </index>
+    <index name="idx_admin_group_admin_id">
+      <index-column name="admin_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table isCrossRef="true" name="group_resource" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="group_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="resource_id" primaryKey="true" required="true" type="INTEGER" />
+    <column defaultValue="0" name="read" type="TINYINT" />
+    <column defaultValue="0" name="write" type="TINYINT" />
+    <foreign-key foreignTable="group" name="fk_group_resource_group_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="group_id" />
+    </foreign-key>
+    <foreign-key foreignTable="resource" name="fk_group_resource_resource_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="resource_id" />
+    </foreign-key>
+    <index name="id_group_resource_group_id">
+      <index-column name="group_id" />
+    </index>
+    <index name="idx_group_resource_resource_id">
+      <index-column name="resource_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="group_module" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="group_id" required="true" type="INTEGER" />
+    <column name="module_id" type="INTEGER" />
+    <column defaultValue="0" name="access" type="TINYINT" />
+    <foreign-key foreignTable="group" name="fk_group_module_group_id" onDelete="CASCADE" onUpdate="CASCADE">
+      <reference foreign="id" local="group_id" />
+    </foreign-key>
+    <foreign-key foreignTable="module" name="fk_group_module_module_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="module_id" />
+    </foreign-key>
+    <index name="idx_group_module_group_id">
+      <index-column name="group_id" />
+    </index>
+    <index name="idx_group_module_module_id">
+      <index-column name="module_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="message" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="name" required="true" size="255" type="VARCHAR" />
+    <column name="secured" type="TINYINT" />
+    <column name="title" type="LONGVARCHAR" />
+    <column name="subject" type="LONGVARCHAR" />
+    <column name="text_message" type="CLOB" />
+    <column name="html_message" type="CLOB" />
+    <unique name="name_UNIQUE">
+      <unique-column name="name" />
+    </unique>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, subject, text_message, html_message" />
+    </behavior>
+    <behavior name="versionable">
+      <parameter name="log_created_at" value="true" />
+      <parameter name="log_created_by" value="true" />
+    </behavior>
+  </table>
+  <table name="coupon" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="code" required="true" size="45" type="VARCHAR" />
+    <column name="type" required="true" size="255" type="VARCHAR" />
+    <column name="title" required="true" size="255" type="VARCHAR" />
+    <column name="short_description" required="true" type="LONGVARCHAR" />
+    <column name="description" required="true" type="CLOB" />
+    <column name="amount" required="true" type="FLOAT" />
+    <column name="is_used" required="true" type="TINYINT" />
+    <column name="is_enabled" required="true" type="TINYINT" />
+    <column name="expiration_date" required="true" type="TIMESTAMP" />
+    <column name="serialized_rules" required="true" type="LONGVARCHAR" />
+    <column name="is_cumulative" required="true" type="TINYINT" />
+    <column name="is_removing_postage" required="true" type="TINYINT" />
+    <column name="max_usage" required="true" type="INTEGER" />
+    <column name="is_available_on_special_offers" required="true" type="BOOLEAN" />
+    <unique name="code_UNIQUE">
+      <unique-column name="code" />
+    </unique>
+    <index name="idx_is_enabled">
+      <index-column name="is_enabled" />
+    </index>
+    <index name="idx_is_used">
+      <index-column name="is_used" />
+    </index>
+    <index name="idx_type">
+      <index-column name="type" />
+    </index>
+    <index name="idx_amount">
+      <index-column name="amount" />
+    </index>
+    <index name="idx_expiration_date">
+      <index-column name="expiration_date" />
+    </index>
+    <index name="idx_is_cumulative">
+      <index-column name="is_cumulative" />
+    </index>
+    <index name="idx_is_removing_postage">
+      <index-column name="is_removing_postage" />
+    </index>
+    <index name="idx_max_usage">
+      <index-column name="max_usage" />
+    </index>
+    <index name="idx_is_available_on_special_offers">
+      <index-column name="is_available_on_special_offers" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, short_description, description" />
+    </behavior>
+    <behavior name="versionable" />
+  </table>
+  <table name="coupon_order" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="order_id" required="true" type="INTEGER" />
+    <column name="value" required="true" type="FLOAT" />
+    <foreign-key foreignTable="order" name="fk_coupon_order_order_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="order_id" />
+    </foreign-key>
+    <index name="idx_coupon_order_order_id">
+      <index-column name="order_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="admin_log" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="admin_login" size="255" type="VARCHAR" />
+    <column name="admin_firstname" size="255" type="VARCHAR" />
+    <column name="admin_lastname" size="255" type="VARCHAR" />
+    <column name="action" size="255" type="VARCHAR" />
+    <column name="request" type="LONGVARCHAR" />
+    <behavior name="timestampable" />
+  </table>
+  <table isCrossRef="true" name="content_folder" namespace="Thelia\Model">
+    <column name="content_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="folder_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="default_folder" type="BOOLEAN" />
+    <foreign-key foreignTable="content" name="fk_content_folder_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="content_id" />
+    </foreign-key>
+    <foreign-key foreignTable="folder" name="fk_content_folder_folder_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="folder_id" />
+    </foreign-key>
+    <index name="idx_content_folder_content_id">
+      <index-column name="content_id" />
+    </index>
+    <index name="idx_content_folder_folder_id">
+      <index-column name="folder_id" />
+    </index>
+    <index name="idx_content_folder_default">
+      <index-column name="default_folder" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="cart" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="token" size="255" type="VARCHAR" />
+    <column name="customer_id" type="INTEGER" />
+    <column name="address_delivery_id" type="INTEGER" />
+    <column name="address_invoice_id" type="INTEGER" />
+    <column name="currency_id" type="INTEGER" />
+    <column defaultValue="0" name="discount" type="FLOAT" />
+    <foreign-key foreignTable="customer" name="fk_cart_customer_id">
+      <reference foreign="id" local="customer_id" />
+    </foreign-key>
+    <foreign-key foreignTable="address" name="fk_cart_address_delivery_id">
+      <reference foreign="id" local="address_delivery_id" />
+    </foreign-key>
+    <foreign-key foreignTable="address" name="fk_cart_address_invoice_id">
+      <reference foreign="id" local="address_invoice_id" />
+    </foreign-key>
+    <foreign-key foreignTable="currency" name="fk_cart_currency_id">
+      <reference foreign="id" local="currency_id" />
+    </foreign-key>
+    <index name="idx_cart_customer_id">
+      <index-column name="customer_id" />
+    </index>
+    <index name="idx_cart_address_delivery_id">
+      <index-column name="address_delivery_id" />
+    </index>
+    <index name="idx_cart_address_invoice_id">
+      <index-column name="address_invoice_id" />
+    </index>
+    <index name="idx_cart_currency_id">
+      <index-column name="currency_id" />
+    </index>
+    <unique name="token_UNIQUE">
+      <unique-column name="token" />
+    </unique>
+    <behavior name="timestampable" />
+  </table>
+  <table name="cart_item" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <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="product_sale_elements_id" required="true" type="INTEGER" />
+    <column name="price" type="FLOAT" />
+    <column name="promo_price" type="FLOAT" />
+    <column name="price_end_of_life" type="TIMESTAMP" />
+    <column defaultValue="0" name="discount" type="FLOAT" />
+    <column name="promo" 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="product_sale_elements" name="fk_cart_item_product_sale_elements_id">
+      <reference foreign="id" local="product_sale_elements_id" />
+    </foreign-key>
+    <index name="idx_cart_item_cart_id">
+      <index-column name="cart_id" />
+    </index>
+    <index name="idx_cart_item_product_id">
+      <index-column name="product_id" />
+    </index>
+    <index name="idx_cart_item_product_sale_elements_id">
+      <index-column name="product_sale_elements_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="product_price" namespace="Thelia\Model">
+    <column name="product_sale_elements_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="currency_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="price" required="true" type="FLOAT" />
+    <column name="promo_price" type="FLOAT" />
+    <foreign-key foreignTable="product_sale_elements" name="fk_product_price_product_sale_elements_id" onDelete="CASCADE">
+      <reference foreign="id" local="product_sale_elements_id" />
+    </foreign-key>
+    <foreign-key foreignTable="currency" name="fk_product_price_currency_id" onDelete="CASCADE">
+      <reference foreign="id" local="currency_id" />
+    </foreign-key>
+    <index name="idx_product_price_product_sale_elements_id">
+      <index-column name="product_sale_elements_id" />
+    </index>
+    <index name="idx_product_price_currency_id">
+      <index-column name="currency_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="category_image" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="category_id" required="true" type="INTEGER" />
+    <column name="file" required="true" size="255" type="VARCHAR" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="category" name="fk_category_image_category_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="category_id" />
+    </foreign-key>
+    <index name="idx_category_image_category_id">
+      <index-column name="category_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="folder_image" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="folder_id" required="true" type="INTEGER" />
+    <column name="file" required="true" size="255" type="VARCHAR" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="folder" name="fk_folder_image_folder_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="folder_id" />
+    </foreign-key>
+    <index name="idx_folder_image_folder_id">
+      <index-column name="folder_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="content_image" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="content_id" required="true" type="INTEGER" />
+    <column name="file" required="true" size="255" type="VARCHAR" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="content" name="fk_content_image_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="content_id" />
+    </foreign-key>
+    <index name="idx_content_image_content_id">
+      <index-column name="content_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="category_document" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="category_id" required="true" type="INTEGER" />
+    <column name="file" required="true" size="255" type="VARCHAR" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="category" name="fk_catgory_document_category_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="category_id" />
+    </foreign-key>
+    <index name="idx_category_document_category_id">
+      <index-column name="category_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="content_document" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="content_id" required="true" type="INTEGER" />
+    <column name="file" required="true" size="255" type="VARCHAR" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="content" name="fk_content_document_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="content_id" />
+    </foreign-key>
+    <index name="idx_content_document_content_id">
+      <index-column name="content_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="folder_document" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="folder_id" required="true" type="INTEGER" />
+    <column name="file" required="true" size="255" type="VARCHAR" />
+    <column name="position" type="INTEGER" />
+    <column name="title" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="chapo" type="LONGVARCHAR" />
+    <column name="postscriptum" type="LONGVARCHAR" />
+    <foreign-key foreignTable="folder" name="fk_folder_document_folder_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="folder_id" />
+    </foreign-key>
+    <index name="idx_folder_document_folder_id">
+      <index-column name="folder_id" />
+    </index>
+    <behavior name="timestampable" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
+    </behavior>
+  </table>
+  <table name="product_associated_content" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="product_id" required="true" type="INTEGER" />
+    <column name="content_id" required="true" type="INTEGER" />
+    <column name="position" required="true" type="INTEGER" />
+    <foreign-key foreignTable="product" name="fk_product_associated_content_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="product_id" />
+    </foreign-key>
+    <foreign-key foreignTable="content" name="fk_product_associated_content_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="content_id" />
+    </foreign-key>
+    <index name="idx_product_associated_content_product_id">
+      <index-column name="product_id" />
+    </index>
+    <index name="idx_product_associated_content_content_id">
+      <index-column name="content_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="category_associated_content" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="category_id" required="true" type="INTEGER" />
+    <column name="content_id" required="true" type="INTEGER" />
+    <column name="position" required="true" type="INTEGER" />
+    <foreign-key foreignTable="category" name="fk_category_associated_content_category_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="category_id" />
+    </foreign-key>
+    <foreign-key foreignTable="content" name="fk_category_associated_content_content_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="content_id" />
+    </foreign-key>
+    <index name="idx_category_associated_content_category_id">
+      <index-column name="category_id" />
+    </index>
+    <index name="idx_category_associated_content_content_id">
+      <index-column name="content_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="rewriting_url" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="url" required="true" size="255" type="VARCHAR" />
+    <column name="view" size="255" type="VARCHAR" />
+    <column name="view_id" size="255" type="VARCHAR" />
+    <column name="view_locale" size="255" type="VARCHAR" />
+    <column name="redirected" type="INTEGER" />
+    <foreign-key foreignTable="rewriting_url" name="fk_rewriting_url_redirected" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference foreign="id" local="redirected" />
+    </foreign-key>
+    <unique name="url_UNIQUE">
+      <unique-column name="url" />
+    </unique>
+    <index name="idx_view_id">
+      <index-column name="view_id" />
+    </index>
+    <index name="idx_rewriting_url_redirected">
+      <index-column name="redirected" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="rewriting_argument" namespace="Thelia\Model">
+    <column name="rewriting_url_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="parameter" primaryKey="true" required="true" size="255" type="VARCHAR" />
+    <column name="value" primaryKey="true" required="true" size="255" type="VARCHAR" />
+    <foreign-key foreignTable="rewriting_url" name="fk_rewriting_argument_rewirting_url_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="rewriting_url_id" />
+    </foreign-key>
+    <index name="idx_rewriting_argument_rewirting_url_id">
+      <index-column name="rewriting_url_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
+  <table name="template" namespace="Thelia\Model">
+    <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="name" size="255" type="VARCHAR" />
+    <behavior name="i18n">
+      <parameter name="i18n_columns" value="name" />
+    </behavior>
+    <behavior name="timestampable" />
+  </table>
+</database>

From da7f9e07c407f3d70f2aea053270bebbddb1ea80 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 17 Sep 2013 20:15:28 +0200
Subject: [PATCH 4/4] create test for UrlRewritingTrait

---
 core/lib/Thelia/Model/RewritingUrl.php        | 12 +--
 .../Thelia/Model/Tools/UrlRewritingTrait.php  |  9 +-
 .../Tests/Rewriting/ProductRewriteTest.php    | 88 +++++++++++++++++++
 3 files changed, 96 insertions(+), 13 deletions(-)
 create mode 100644 core/lib/Thelia/Tests/Rewriting/ProductRewriteTest.php

diff --git a/core/lib/Thelia/Model/RewritingUrl.php b/core/lib/Thelia/Model/RewritingUrl.php
index 9dd826d01..a13777c41 100644
--- a/core/lib/Thelia/Model/RewritingUrl.php
+++ b/core/lib/Thelia/Model/RewritingUrl.php
@@ -2,25 +2,25 @@
 
 namespace Thelia\Model;
 
+use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Thelia\Model\Base\RewritingUrl as BaseRewritingUrl;
 use Thelia\Model\RewritingUrlQuery;
 
 class RewritingUrl extends BaseRewritingUrl {
 
-    public function preSave(ConnectionInterface $con = null)
+    public function postInsert(ConnectionInterface $con = null)
     {
-        if($this->getRedirected() == 0) {
-            //check if rewriting url alredy exists and put redirect to 1
+        if(null !== $this->getRedirected()) {
+            //check if rewriting url alredy exists and put redirect to the new one
             RewritingUrlQuery::create()
                 ->filterByView($this->getView())
                 ->filterByViewId($this->getViewId())
                 ->filterByViewLocale($this->getViewLocale())
+                ->filterByRedirected($this->getId(), Criteria::NOT_IN)
                 ->update(array(
-                    "redirect" => 1
+                    "Redirected" => $this->getId()
                 ));
         }
-
-        return true;
     }
 }
diff --git a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
index c9154a0db..1b9087626 100644
--- a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
+++ b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
@@ -55,17 +55,13 @@ trait UrlRewritingTrait {
     public function generateRewrittenUrl($locale)
     {
         if ($this->isNew()) {
-            throw new \RuntimeException(sprintf('Object %s must be save before generating url', $this->getRewrittenUrlViewName()));
+            throw new \RuntimeException(sprintf('Object %s must be saved before generating url', $this->getRewrittenUrlViewName()));
         }
         // Borrowed from http://stackoverflow.com/questions/2668854/sanitizing-strings-to-make-them-url-and-filename-safe
 
         $this->setLocale($locale);
 
-        $title = $this->getTitle();
-
-        if (null === $title) {
-            throw new \RuntimeException(sprintf('Impossible to generate url if title does not exists for the locale %s', $locale));
-        }
+        $title = $this->getTitle() ?: $this->getRef();
         // Replace all weird characters with dashes
         $string = preg_replace('/[^\w\-~_\.]+/u', '-', $title);
 
@@ -88,7 +84,6 @@ trait UrlRewritingTrait {
                 ->setView($this->getRewrittenUrlViewName())
                 ->setViewId($this->getId())
                 ->setViewLocale($locale)
-                ->setRedirected(0)
                 ->save()
             ;
         }
diff --git a/core/lib/Thelia/Tests/Rewriting/ProductRewriteTest.php b/core/lib/Thelia/Tests/Rewriting/ProductRewriteTest.php
new file mode 100644
index 000000000..c38773814
--- /dev/null
+++ b/core/lib/Thelia/Tests/Rewriting/ProductRewriteTest.php
@@ -0,0 +1,88 @@
+<?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\Tests\Rewriting;
+use Thelia\Model\Product;
+use Thelia\Model\ProductQuery;
+
+
+/**
+ * Class ProductRewriteTest
+ * @package Thelia\Tests\Rewriting
+ * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ */
+class ProductRewriteTest extends \PHPUnit_Framework_TestCase
+{
+    protected static $productId;
+
+    public static function setUpBeforeClass()
+    {
+        $product = new Product();
+        $product->setRef(sprintf("TestRewrittenProduct%s",uniqid()))
+            ->setPosition(1)
+            ->setVisible(1)
+            ->setLocale('en_US')
+                ->setTitle('My english super Title')
+            ->setLocale('fr_FR')
+                ->setTitle('Mon super titre en français')
+            ->save();
+
+        self::$productId = $product->getId();
+    }
+
+    /**
+     * @covers Thelia\Model\Tools\UrlRewritingTrait::generateRewrittenUrl
+     */
+    public function testFrenchRewrittenUrl()
+    {
+        $product = ProductQuery::create()->findPk(self::$productId);
+
+        $rewrittenUrl = $product->generateRewrittenUrl('fr_FR');
+        $this->assertNotNull($rewrittenUrl, "rewritten url can not be null");
+        $this->assertRegExp('/^mon-super-titre-en-français(-[0-9]+)?\.html$/', $rewrittenUrl);
+        //mon-super-titre-en-français-2.html
+    }
+
+    /**
+     * @covers Thelia\Model\Tools\UrlRewritingTrait::generateRewrittenUrl
+     */
+    public function testEnglishRewrittenUrl()
+    {
+        $product = ProductQuery::create()->findPk(self::$productId);
+
+        $rewrittenUrl = $product->generateRewrittenUrl('en_US');
+        $this->assertNotNull($rewrittenUrl, "rewritten url can not be null");
+        $this->assertRegExp('/^my-english-super-title(-[0-9]+)?\.html$/', $rewrittenUrl);
+    }
+
+    /**
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage Object product must be saved before generating url
+     */
+    public function testOnNotSavedProduct()
+    {
+        $product = new Product();
+
+        $product->generateRewrittenUrl('fr_FR');
+    }
+}
\ No newline at end of file