From 86078d3054ac0927a94d3e09476eb383afb96189 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Wed, 18 Sep 2013 19:33:24 +0200
Subject: [PATCH 01/51] - Edit shipping_zone routes - Create
 shipping_configuration routes

---
 .../Thelia/Config/Resources/routing/admin.xml | 21 ++++++---
 .../Admin/ShippingConfigurationController.php | 46 +++++++++++++++++++
 .../Admin/ShippingZoneController.php          |  2 +-
 .../admin/default/shipping-configuration.html |  0
 templates/admin/default/shipping-zones.html   |  8 ++--
 5 files changed, 66 insertions(+), 11 deletions(-)
 create mode 100644 core/lib/Thelia/Controller/Admin/ShippingConfigurationController.php
 create mode 100644 templates/admin/default/shipping-configuration.html

diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index 50b622451..af7b7e445 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -405,17 +405,26 @@
 
     <!-- Shipping zones routes management -->
 
-    <route id="admin.configuration.shipping-zones.default" path="/admin/configuration/shipping-zones">
+    <route id="admin.configuration.shipping-zones.default" path="/admin/configuration/shipping_zones">
         <default key="_controller">Thelia\Controller\Admin\ShippingZoneController::indexAction</default>
     </route>
 
-    <route id="admin.configuration.shipping-zones.create" path="/admin/configuration/shipping-zones/create">
-        <default key="_controller">Thelia\Controller\Admin\ShippingZoneController::createAction</default>
+    <route id="admin.configuration.shipping-zones.update.view" path="/admin/configuration/shipping_zones/update/{shipping_zones_id}" methods="get">
+        <default key="_controller">Thelia\Controller\Admin\ShippingZoneController::updateAction</default>
+        <requirement key="shipping_zones_id">\d+</requirement>
     </route>
 
-    <route id="admin.configuration.shipping-zones.update.view" path="/admin/configuration/shipping-zones/update/{shipping_zones_id}" methods="get">
-        <default key="_controller">Thelia\Controller\Admin\ShippingZoneController::updateAction</default>
-        <requirement key="country_id">\d+</requirement>
+    <!-- end shipping routes management -->
+
+    <!-- Shipping zones routes management -->
+
+    <route id="admin.configuration.shipping-configuration.default" path="/admin/configuration/shipping_configuration">
+        <default key="_controller">Thelia\Controller\Admin\ShippingConfigurationController::indexAction</default>
+    </route>
+
+    <route id="admin.configuration.shipping-configuration.update.view" path="/admin/configuration/shipping_configuration/update/{shipping_configuration_id}" methods="get">
+        <default key="_controller">Thelia\Controller\Admin\ShippingConfigurationController::updateAction</default>
+        <requirement key="shipping_configuration_id">\d+</requirement>
     </route>
 
     <!-- end shipping routes management -->
diff --git a/core/lib/Thelia/Controller/Admin/ShippingConfigurationController.php b/core/lib/Thelia/Controller/Admin/ShippingConfigurationController.php
new file mode 100644
index 000000000..71aa0ba2f
--- /dev/null
+++ b/core/lib/Thelia/Controller/Admin/ShippingConfigurationController.php
@@ -0,0 +1,46 @@
+<?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\Controller\Admin;
+
+/**
+ * Class ShippingConfigurationController
+ * @package Thelia\Controller\Admin
+ * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ */
+class ShippingConfigurationController extends BaseAdminController
+{
+    public function indexAction()
+    {
+        if (null !== $response = $this->checkAuth("admin.shipping-configuration.view")) return $response;
+        return $this->render("shipping-configuration", array("display_shipping_configuration" => 20));
+    }
+    
+    public function updateAction($shipping_configuration_id)
+    {
+
+        return $this->render("shipping-configuration-edit", array(
+            "shipping_configuration_id" => $shipping_configuration_id
+        ));
+    }
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Controller/Admin/ShippingZoneController.php b/core/lib/Thelia/Controller/Admin/ShippingZoneController.php
index 8be799a73..ee34d11bd 100644
--- a/core/lib/Thelia/Controller/Admin/ShippingZoneController.php
+++ b/core/lib/Thelia/Controller/Admin/ShippingZoneController.php
@@ -24,7 +24,7 @@
 namespace Thelia\Controller\Admin;
 
 /**
- * Class FolderController
+ * Class ShippingZoneController
  * @package Thelia\Controller\Admin
  * @author Manuel Raynaud <mraynaud@openstudio.fr>
  */
diff --git a/templates/admin/default/shipping-configuration.html b/templates/admin/default/shipping-configuration.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/templates/admin/default/shipping-zones.html b/templates/admin/default/shipping-zones.html
index 7d9af91fe..9cb7fbc59 100644
--- a/templates/admin/default/shipping-zones.html
+++ b/templates/admin/default/shipping-zones.html
@@ -44,7 +44,7 @@
                                     {if ! $SECURED}
                                         <div class="btn-group">
                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-zones.change"}
-                                               <a class="btn btn-default btn-xs shipping-zones-change" title="{intl l='Change this shipping zone'}" href="{url path="/admin/configuration/shipping-zones/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                               <a class="btn btn-default btn-xs shipping-zones-change" title="{intl l='Change this shipping zone'}" href="{url path="/admin/configuration/shipping_zones/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
                                            {/loop}                                               
                                         </div>
                                     {else}
@@ -61,7 +61,7 @@
                                     {if ! $SECURED}
                                         <div class="btn-group">
                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-zones.change"}
-                                               <a class="btn btn-default btn-xs shipping-zones-change" title="{intl l='Change this shipping zone'}" href="{url path="/admin/configuration/shipping-zones/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                               <a class="btn btn-default btn-xs shipping-zones-change" title="{intl l='Change this shipping zone'}" href="{url path="/admin/configuration/shipping_zones/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
                                            {/loop}                                               
                                         </div>
                                     {else}
@@ -78,7 +78,7 @@
                                     {if ! $SECURED}
 	                                    <div class="btn-group">
                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-zones.change"}
-                                               <a class="btn btn-default btn-xs shipping-zones-change" title="{intl l='Change this shipping zone'}" href="{url path="/admin/configuration/shipping-zones/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                               <a class="btn btn-default btn-xs shipping-zones-change" title="{intl l='Change this shipping zone'}" href="{url path="/admin/configuration/shipping_zones/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
                                            {/loop}                                               
 	                                    </div>
 	                                {else}
@@ -113,7 +113,7 @@
         dialog_title    = {intl l="Delete shipping zone"}
         dialog_message  = {intl l="Do you really want to delete this shipping zone ?"}
 
-        form_action         = {url path='/admin/configuration/shipping-zones/delete'}
+        form_action         = {url path='/admin/configuration/shipping_zones/delete'}
         form_content        = {$smarty.capture.delete_dialog nofilter}
     }
 {/block}
\ No newline at end of file

From 18d9e0317217afc29075aa1d7b35b63afb521dde Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Wed, 18 Sep 2013 23:14:29 +0200
Subject: [PATCH 02/51] Finish shipping configuration default view

---
 .../admin/default/shipping-configuration.html | 164 ++++++++++++++++++
 1 file changed, 164 insertions(+)

diff --git a/templates/admin/default/shipping-configuration.html b/templates/admin/default/shipping-configuration.html
index e69de29bb..ae9090c70 100644
--- a/templates/admin/default/shipping-configuration.html
+++ b/templates/admin/default/shipping-configuration.html
@@ -0,0 +1,164 @@
+{extends file="admin-layout.tpl"}
+
+{block name="page-title"}{intl l='Thelia Shipping configuration'}{/block}
+
+{block name="check-permissions"}admin.configuration.shipping-configuration.view{/block}
+
+{block name="main-content"}
+<div class="shipping-configurations">
+
+    <div id="wrapper" class="container">
+
+        <ul class="breadcrumb">
+            <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
+            <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
+            <li><a href="{url path='/admin/configuration/shipping-configuration'}">{intl l="Shipping configuration"}</a></li>
+        </ul>
+
+        {module_include location='shipping_configuration_top'}
+
+        <div class="row">
+            <div class="col-md-12">
+                <div class="general-block-decorator">
+                    <table class="table table-striped table-condensed table-left-aligned">
+                        <caption class="clearfix">
+                            {intl l='Thelia Shipping configuration'}
+                            {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.shipping-configuration.create"}
+                            <a class="btn btn-default btn-primary pull-right" title="{intl l='Add a new shipping configuration'}" href="#creation_dialog" data-toggle="modal">
+                                <span class="glyphicon glyphicon-plus-sign"></span>
+                            </a>
+                            {/loop}                        
+                        </caption>
+                        <thead>
+	                        <tr>	                           
+                               <th>{intl l="Description"}</th>
+
+                               {module_include location='shipping_configuration_table_header'}
+
+                               <th>{intl l="Actions"}</th>
+	                        </tr>
+                        </thead>
+
+                        <tbody>
+                            <tr>
+                               <td>France</td>                                   
+
+                                {module_include location='shipping_configuration_table_row'}
+
+                                <td>
+                                    {if ! $SECURED}
+                                        <div class="btn-group">
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-configuration.change"}
+                                               <a class="btn btn-default btn-xs shipping-configuration-change" title="{intl l='Change this shipping configuration'}" href="{url path="/admin/configuration/shipping_configuration/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                            {/loop}
+                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.shipping-configuration.delete"}
+                                                <a class="btn btn-default btn-xs shipping-configuration-delete" title="{intl l='Delete this shipping configuration'}"  href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                            {/loop}                                              
+                                        </div>
+                                    {else}
+                                        <i title="{intl l='This shipping configuration could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
+                                    {/if}
+                                </td>
+                            </tr>
+                            <tr>
+                               <td>Outre-Mer DOM</td>                                   
+
+                                {module_include location='shipping_configuration_table_row'}
+
+                                <td>
+                                    {if ! $SECURED}
+                                        <div class="btn-group">
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-configuration.change"}
+                                               <a class="btn btn-default btn-xs shipping-configuration-change" title="{intl l='Change this shipping configuration'}" href="{url path="/admin/configuration/shipping_configuration/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                            {/loop}
+                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.shipping-configuration.delete"}
+                                                <a class="btn btn-default btn-xs shipping-configuration-delete" title="{intl l='Delete this shipping configuration'}"  href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                            {/loop}                                              
+                                        </div>
+                                    {else}
+                                        <i title="{intl l='This shipping configuration could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
+                                    {/if}
+                                </td>
+                            </tr>
+                            <tr>
+                               <td>Outre-Mer TOM</td>                                   
+
+                                {module_include location='shipping_configuration_table_row'}
+
+                                <td>
+                                    {if ! $SECURED}
+                                        <div class="btn-group">
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-configuration.change"}
+                                               <a class="btn btn-default btn-xs shipping-configuration-change" title="{intl l='Change this shipping configuration'}" href="{url path="/admin/configuration/shipping_configuration/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                            {/loop}
+                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.shipping-configuration.delete"}
+                                                <a class="btn btn-default btn-xs shipping-configuration-delete" title="{intl l='Delete this shipping configuration'}"  href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                            {/loop}                                              
+                                        </div>
+                                    {else}
+                                        <i title="{intl l='This shipping configuration could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
+                                    {/if}
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+
+        {module_include location='shipping_configuration_bottom'}
+
+    </div>
+</div>
+    
+    {* Adding a new Shipping configuration *}
+
+    {* Capture the dialog body, to pass it to the generic dialog *}
+    {capture "creation_dialog"}
+
+        
+        <div class="form-group">
+            <label for="" class="control-label">{intl l="Name"} : </label>
+            <input type="text" id="" name="" class="form-control" title="{intl l="Name"}" placeholder="{intl l='Shipping configuration name'}">
+        </div>
+       
+
+        {module_include location='shipping_configuration_create_form'}
+
+    {/capture}
+
+    {include
+        file = "includes/generic-create-dialog.html"
+
+        dialog_id    = "creation_dialog"
+        dialog_title = {intl l="Create a new shipping configuration"}
+        dialog_body  = {$smarty.capture.creation_dialog nofilter}
+
+        dialog_ok_label     = {intl l="Create this shipping configuration"}
+        dialog_cancel_label = {intl l="Cancel"}
+
+        form_action        = {url path='/admin/configuration/configuration/shipping_configuration/create'}
+        form_enctype       = ''
+        form_error_message = $form_error_message
+    }
+
+    {* Delete confirmation dialog *}
+
+    {capture "delete_dialog"}
+        <input type="hidden" name="shipping_zones_id" id="shipping_configuration_delete_id" value="" />
+
+        {module_include location='shipping_configuration_delete_form'}
+
+    {/capture}
+
+    {include
+        file = "includes/generic-confirm-dialog.html"
+
+        dialog_id       = "delete_dialog"
+        dialog_title    = {intl l="Delete shipping configuration"}
+        dialog_message  = {intl l="Do you really want to delete this shipping configuration ?"}
+
+        form_action         = {url path='/admin/configuration/shipping_configuration/delete'}
+        form_content        = {$smarty.capture.delete_dialog nofilter}
+    }
+{/block}
\ No newline at end of file

From a02ba364bebbc1a5da5e96de862e51e043f45f9b Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Thu, 19 Sep 2013 10:15:14 +0200
Subject: [PATCH 03/51] Change background image to simple background color

---
 templates/admin/default/assets/less/thelia/scaffolding.less | 5 +++--
 web/install/styles.css                                      | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/templates/admin/default/assets/less/thelia/scaffolding.less b/templates/admin/default/assets/less/thelia/scaffolding.less
index 1309638e4..01b6fbaf7 100755
--- a/templates/admin/default/assets/less/thelia/scaffolding.less
+++ b/templates/admin/default/assets/less/thelia/scaffolding.less
@@ -7,8 +7,9 @@
 // -------------------------
 
 body {
-  background: #FFF url("@{imgDir}/bg.jpg") top left no-repeat;
-  background-size: cover;
+  // background: #FFF url("@{imgDir}/bg.jpg") top left no-repeat;
+  // background-size: cover;
+  background-color: #eee;
 }
 
 
diff --git a/web/install/styles.css b/web/install/styles.css
index 98454c60e..192f23559 100755
--- a/web/install/styles.css
+++ b/web/install/styles.css
@@ -5822,8 +5822,9 @@ fieldset[disabled] .navbar .btn.active {
     background-color: #fff;
 }
 body {
-    background: #FFF url(data:image/jpeg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAAyAAD/4QMtaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjMtYzAxMSA2Ni4xNDU2NjEsIDIwMTIvMDIvMDYtMTQ6NTY6MjcgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6REQxQTRFNjExMUMwMTFFMzgyRkZGOEQ5NUMwQUQyQjgiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6REQxQTRFNjIxMUMwMTFFMzgyRkZGOEQ5NUMwQUQyQjgiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpERDFBNEU1RjExQzAxMUUzODJGRkY4RDk1QzBBRDJCOCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpERDFBNEU2MDExQzAxMUUzODJGRkY4RDk1QzBBRDJCOCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pv/uACFBZG9iZQBkwAAAAAEDABADAwYJAAB+qwAAf6kAAMQb/9sA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JQiiKIoigAAAAAAAAACKIoiiKIoiiKAAAAAAAAAAJQiiKIoigApRSKIqIspKIsAQAAVZQFIoiolAACKqKIokoiiKSKIpZQKIoioiiSqiwSkiiKJQFWKIoiiLAEiiKIoiiKLK1JQAAAAAFIoiiLACKiKIoiligAAIAAAASiKqKIoiiKIoiiKIolAIACpQAAAAAACAAAAAAAAAAAAAFAACLAAAAAAAAAACKIoiiKIoiiKIoiiUEoigAACKIoiiKIoiiKJQAAASiKIoiiKJQiiKIoiiKIoAUBViiKIogSLAAAABQAKWKAQAFiiKIsQCLAoiiUAAAAAIsAIoiiKAAAAAAIoiiKIoiqhSyrAAAAAAgAAABKIoiiAAAFIoiiKIoiiKIoiiKIoiiKIoiiKIoiiKIsCwAKIUiiKIoiiKIoiiKIoiiKIoiiKIoiiUUAIKIogqKIoiiKIoikiliiKIAsAQAAAAAUiiKIoiiKIsAABSLAAoiiKIoiiKIoiiKIpYqIqyKIoiiKIoiiKJSUUAAAASiAiiKIoigBZQAAAAAABKIAAAAUlCKIogAEoiqikiiKWKSKIqWKsgAAAAAAAKoiiKIoiiUAAAAEoiiKIsAAAAAAAAAAAAAAAAAAAACwAAAAAAAFIUiwKIoiiKIoiiKIoiiKIoiiKIoigJQEqopIoiiKIoiiKIogAAAAAAAAAACiKIsCwAAAAAAAFIoiiKIohSKIoiiKIsAAAAAAACgJQAAAAEqosQoiiKIoigJQAAAAAAEqopJQCUAAAACKsiiLAAUiiAFIsAAAAAAAAAKoiiKIoiiKIoiiKIoiiKIogAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACiKIoiiKIoiiKIoiiKIoiiKIohSAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKIolACKIoiwAAAFIoiiKIsBSKIoiiKIoiiAKIoiiKIoiiKIogAACiKIoiiKIAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFIoiiKIsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABSKIoiwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAA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) top left no-repeat;
-    background-size: cover;
+    /*background: #FFF url(data:image/jpeg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAAyAAD/4QMtaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjMtYzAxMSA2Ni4xNDU2NjEsIDIwMTIvMDIvMDYtMTQ6NTY6MjcgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6REQxQTRFNjExMUMwMTFFMzgyRkZGOEQ5NUMwQUQyQjgiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6REQxQTRFNjIxMUMwMTFFMzgyRkZGOEQ5NUMwQUQyQjgiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpERDFBNEU1RjExQzAxMUUzODJGRkY4RDk1QzBBRDJCOCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpERDFBNEU2MDExQzAxMUUzODJGRkY4RDk1QzBBRDJCOCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pv/uACFBZG9iZQBkwAAAAAEDABADAwYJAAB+qwAAf6kAAMQb/9sA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JQiiKIoigAAAAAAAAACKIoiiKIoiiKAAAAAAAAAAJQiiKIoigApRSKIqIspKIsAQAAVZQFIoiolAACKqKIokoiiKSKIpZQKIoioiiSqiwSkiiKJQFWKIoiiLAEiiKIoiiKLK1JQAAAAAFIoiiLACKiKIoiligAAIAAAASiKqKIoiiKIoiiKIolAIACpQAAAAAACAAAAAAAAAAAAAFAACLAAAAAAAAAACKIoiiKIoiiKIoiiUEoigAACKIoiiKIoiiKJQAAASiKIoiiKJQiiKIoiiKIoAUBViiKIogSLAAAABQAKWKAQAFiiKIsQCLAoiiUAAAAAIsAIoiiKAAAAAAIoiiKIoiqhSyrAAAAAAgAAABKIoiiAAAFIoiiKIoiiKIoiiKIoiiKIoiiKIoiiKIsCwAKIUiiKIoiiKIoiiKIoiiKIoiiKIoiiUUAIKIogqKIoiiKIoikiliiKIAsAQAAAAAUiiKIoiiKIsAABSLAAoiiKIoiiKIoiiKIpYqIqyKIoiiKIoiiKJSUUAAAASiAiiKIoigBZQAAAAAABKIAAAAUlCKIogAEoiqikiiKWKSKIqWKsgAAAAAAAKoiiKIoiiUAAAAEoiiKIsAAAAAAAAAAAAAAAAAAAACwAAAAAAAFIUiwKIoiiKIoiiKIoiiKIoiiKIoigJQEqopIoiiKIoiiKIogAAAAAAAAAACiKIsCwAAAAAAAFIoiiKIohSKIoiiKIsAAAAAAACgJQAAAAEqosQoiiKIoigJQAAAAAAEqopJQCUAAAACKsiiLAAUiiAFIsAAAAAAAAAKoiiKIoiiKIoiiKIoiiKIogAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACiKIoiiKIoiiKIoiiKIoiiKIohSAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKIolACKIoiwAAAFIoiiKIsBSKIoiiKIoiiAKIoiiKIoiiKIogAACiKIoiiKIAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFIoiiKIsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABSKIoiwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAA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) top left no-repeat;
+    background-size: cover;*/
+    background-color: #eee;
 }
 a {
     font-weight: bold;

From 96ffe88938786b0175f8a0930d72d7c6d44cec8d Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Thu, 19 Sep 2013 12:30:35 +0200
Subject: [PATCH 04/51] fix loop image argument

---
 templates/default/product.html | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/templates/default/product.html b/templates/default/product.html
index a7cae0d34..329f674cd 100644
--- a/templates/default/product.html
+++ b/templates/default/product.html
@@ -23,7 +23,8 @@
 
             <section id="product-gallery">
                 <figure class="product-image">
-                    {loop type="image" name="image.main" product="{$ID}" width="560" height="445" resize_mode="borders" limit="1" force_result="1"}
+                    {lang attr="id"} {lang attr="title"}
+                    {loop type="image" name="image.main" product="{$ID}" width="560" height="445" resize_mode="borders" limit="1" force_return="true"}
                         <img src="{$IMAGE_URL}" alt="{$TITLE}" class="img-responsive" itemprop="image" data-toggle="magnify">
                     {/loop}
                 </figure>
@@ -32,10 +33,10 @@
                     <div class="carousel-inner">
                         <div class="item active">
                             <ul>
-                                {loop name="image.carousel" type="image" product="{$ID}"  width="560" height="445" resize_mode="borders" limit="5" force_result="1"}
+                                {loop name="image.carousel" type="image" product="{$ID}"  width="560" height="445" resize_mode="borders" limit="5" force_return="true"}
                                 <li>
                                     <a href="{$IMAGE_URL}" class="thumbnail {if $LOOP_COUNT == 1}active{/if}">
-                                        {loop type="image" name="image.thumbs" id="{$ID}" product="$OBJECT_ID" width="118" height="85" resize_mode="borders" force_result="1"}
+                                        {loop type="image" name="image.thumbs" id="{$ID}" product="$OBJECT_ID" width="118" height="85" resize_mode="borders" force_return="true"}
                                             <img src="{$IMAGE_URL}" alt="{$TITLE}">
                                         {/loop}
                                     </a>
@@ -47,10 +48,10 @@
                         <div class="item">
                             <ul>
 
-                                {loop name="image.carouselsup" type="image" product="{$ID}"  width="560" height="445" resize_mode="crop" offset="5" force_result="1"}
+                                {loop name="image.carouselsup" type="image" product="{$ID}"  width="560" height="445" resize_mode="crop" offset="5" force_return="true"}
                                     <li>
                                         <a href="{$IMAGE_URL}" class="thumbnail">
-                                            {loop type="image" name="image.thumbssup" id="{$ID}" product="$OBJECT_ID" width="118" height="85" resize_mode="crop" force_result="1"}
+                                            {loop type="image" name="image.thumbssup" id="{$ID}" product="$OBJECT_ID" width="118" height="85" resize_mode="crop" force_return="true"}
                                                 <img src="{$IMAGE_URL}" alt="{$TITLE}">
                                             {/loop}
                                         </a>

From 0ebaf458edd45c1ddb85a2ab968311e8891fe5e8 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Thu, 19 Sep 2013 12:31:46 +0200
Subject: [PATCH 05/51] - Adding of bootstrap-select - Finish
 shipping_configuration view - bootstrap-select on shipping_zones view

---
 .../js/bootstrap-select/bootstrap-select.js   | 709 ++++++++++++++++++
 templates/admin/default/assets/js/main.js     |   5 +
 .../assets/less/thelia/bootstrap-select.less  | 269 +++++++
 .../default/assets/less/thelia/thelia.less    |   1 +
 .../default/shipping-configuration-edit.html  | 136 ++++
 .../admin/default/shipping-zones-edit.html    |  13 +-
 templates/admin/default/shipping-zones.html   |   2 +-
 7 files changed, 1132 insertions(+), 3 deletions(-)
 create mode 100644 templates/admin/default/assets/js/bootstrap-select/bootstrap-select.js
 create mode 100644 templates/admin/default/assets/less/thelia/bootstrap-select.less
 create mode 100644 templates/admin/default/shipping-configuration-edit.html

diff --git a/templates/admin/default/assets/js/bootstrap-select/bootstrap-select.js b/templates/admin/default/assets/js/bootstrap-select/bootstrap-select.js
new file mode 100644
index 000000000..dcfd633a0
--- /dev/null
+++ b/templates/admin/default/assets/js/bootstrap-select/bootstrap-select.js
@@ -0,0 +1,709 @@
+/*!
+ * bootstrap-select v1.3.1
+ * http://silviomoreto.github.io/bootstrap-select/
+ *
+ * Copyright 2013 bootstrap-select
+ * Licensed under the MIT license
+ */
+
+!function($) {
+
+    "use strict";
+
+    $.expr[":"].icontains = $.expr.createPseudo(function(arg) {
+        return function( elem ) {
+            return $(elem).text().toUpperCase().indexOf(arg.toUpperCase()) >= 0;
+        };
+    });
+
+    var Selectpicker = function(element, options, e) {
+        if (e) {
+            e.stopPropagation();
+            e.preventDefault();
+        }
+        this.$element = $(element);
+        this.$newElement = null;
+        this.$button = null;
+        this.$menu = null;
+
+        //Merge defaults, options and data-attributes to make our options
+        this.options = $.extend({}, $.fn.selectpicker.defaults, this.$element.data(), typeof options == 'object' && options);
+
+        //If we have no title yet, check the attribute 'title' (this is missed by jq as its not a data-attribute
+        if (this.options.title == null) {
+            this.options.title = this.$element.attr('title');
+        }
+
+        //Expose public methods
+        this.val = Selectpicker.prototype.val;
+        this.render = Selectpicker.prototype.render;
+        this.refresh = Selectpicker.prototype.refresh;
+        this.setStyle = Selectpicker.prototype.setStyle;
+        this.selectAll = Selectpicker.prototype.selectAll;
+        this.deselectAll = Selectpicker.prototype.deselectAll;
+        this.init();
+    };
+
+    Selectpicker.prototype = {
+
+        constructor: Selectpicker,
+
+        init: function(e) {
+            this.$element.hide();
+            this.multiple = this.$element.prop('multiple');
+            var id = this.$element.attr('id');
+            this.$newElement = this.createView();
+            this.$element.after(this.$newElement);
+            this.$menu = this.$newElement.find('> .dropdown-menu');
+            this.$button = this.$newElement.find('> button');
+            this.$searchbox = this.$newElement.find('input');
+
+            if (id !== undefined) {
+                var that = this;
+                this.$button.attr('data-id', id);
+                $('label[for="' + id + '"]').click(function(e) {
+                    e.preventDefault();
+                    that.$button.focus();
+                });
+            }
+
+            this.checkDisabled();
+            this.checkTabIndex();
+            this.clickListener();
+            this.liveSearchListener();
+            this.render();
+            this.liHeight();
+            this.setStyle();
+            this.setWidth();
+            if (this.options.container) {
+                this.selectPosition();
+            }
+            this.$menu.data('this', this);
+            this.$newElement.data('this', this);
+        },
+
+        createDropdown: function() {
+            //If we are multiple, then add the show-tick class by default
+            var multiple = this.multiple ? ' show-tick' : '';
+            var header = this.options.header ? '<h3 class="popover-title">' + this.options.header + '<button type="button" class="close" aria-hidden="true">&times;</button></h3>' : '';
+            var searchbox = this.options.liveSearch ? '<div class="bootstrap-select-searchbox"><input type="text" class="input-block-level form-control" /></div>' : '';
+            var drop =
+                "<div class='btn-group bootstrap-select" + multiple + "'>" +
+                    "<button type='button' class='btn dropdown-toggle' data-toggle='dropdown'>" +
+                        "<div class='filter-option pull-left'></div>&nbsp;" +
+                        "<div class='caret'></div>" +
+                    "</button>" +
+                    "<div class='dropdown-menu open'>" +
+                        header +
+                        searchbox +
+                        "<ul class='dropdown-menu inner' role='menu'>" +
+                        "</ul>" +
+                    "</div>" +
+                "</div>";
+
+            return $(drop);
+        },
+
+        createView: function() {
+            var $drop = this.createDropdown();
+            var $li = this.createLi();
+            $drop.find('ul').append($li);
+            return $drop;
+        },
+
+        reloadLi: function() {
+            //Remove all children.
+            this.destroyLi();
+            //Re build
+            var $li = this.createLi();
+            this.$menu.find('ul').append( $li );
+        },
+
+        destroyLi: function() {
+            this.$menu.find('li').remove();
+        },
+
+        createLi: function() {
+            var that = this,
+                _liA = [],
+                _liHtml = '';
+
+            this.$element.find('option').each(function(index) {
+                var $this = $(this);
+
+                //Get the class and text for the option
+                var optionClass = $this.attr("class") || '';
+                var inline = $this.attr("style") || '';
+                var text =  $this.data('content') ? $this.data('content') : $this.html();
+                var subtext = $this.data('subtext') !== undefined ? '<small class="muted">' + $this.data('subtext') + '</small>' : '';
+                var icon = $this.data('icon') !== undefined ? '<i class="glyphicon '+$this.data('icon')+'"></i> ' : '';
+                if (icon !== '' && ($this.is(':disabled') || $this.parent().is(':disabled'))) {
+                    icon = '<span>'+icon+'</span>';
+                }
+
+                if (!$this.data('content')) {
+                    //Prepend any icon and append any subtext to the main text.
+                    text = icon + '<span class="text">' + text + subtext + '</span>';
+                }
+
+                if (that.options.hideDisabled && ($this.is(':disabled') || $this.parent().is(':disabled'))) {
+                    _liA.push('<a style="min-height: 0; padding: 0"></a>');
+                } else if ($this.parent().is('optgroup') && $this.data('divider') != true) {
+                    if ($this.index() == 0) {
+                        //Get the opt group label
+                        var label = $this.parent().attr('label');
+                        var labelSubtext = $this.parent().data('subtext') !== undefined ? '<small class="muted">'+$this.parent().data('subtext')+'</small>' : '';
+                        var labelIcon = $this.parent().data('icon') ? '<i class="'+$this.parent().data('icon')+'"></i> ' : '';
+                        label = labelIcon + '<span class="text">' + label + labelSubtext + '</span>';
+
+                        if ($this[0].index != 0) {
+                            _liA.push(
+                                '<div class="div-contain"><div class="divider"></div></div>'+
+                                '<dt>'+label+'</dt>'+
+                                that.createA(text, "opt " + optionClass, inline )
+                                );
+                        } else {
+                            _liA.push(
+                                '<dt>'+label+'</dt>'+
+                                that.createA(text, "opt " + optionClass, inline ));
+                        }
+                    } else {
+                         _liA.push(that.createA(text, "opt " + optionClass, inline ));
+                    }
+                } else if ($this.data('divider') == true) {
+                    _liA.push('<div class="div-contain"><div class="divider"></div></div>');
+                } else if ($(this).data('hidden') == true) {
+                    _liA.push('');
+                } else {
+                    _liA.push(that.createA(text, optionClass, inline ));
+                }
+            });
+
+            $.each(_liA, function(i, item) {
+                _liHtml += "<li rel=" + i + ">" + item + "</li>";
+            });
+
+            //If we are not multiple, and we dont have a selected item, and we dont have a title, select the first element so something is set in the button
+            if (!this.multiple && this.$element.find('option:selected').length==0 && !this.options.title) {
+                this.$element.find('option').eq(0).prop('selected', true).attr('selected', 'selected');
+            }
+
+            return $(_liHtml);
+        },
+
+        createA: function(text, classes, inline) {
+            return '<a tabindex="0" class="'+classes+'" style="'+inline+'">' +
+                 text +
+                 '<i class="glyphicon glyphicon-ok icon-ok check-mark"></i>' +
+                 '</a>';
+        },
+
+        render: function() {
+            var that = this;
+
+            //Update the LI to match the SELECT
+            this.$element.find('option').each(function(index) {
+               that.setDisabled(index, $(this).is(':disabled') || $(this).parent().is(':disabled') );
+               that.setSelected(index, $(this).is(':selected') );
+            });
+
+            var selectedItems = this.$element.find('option:selected').map(function(index,value) {
+                var $this = $(this);
+                var icon = $this.data('icon') && that.options.showIcon ? '<i class="glyphicon ' + $this.data('icon') + '"></i> ' : '';
+                var subtext;
+                if (that.options.showSubtext && $this.attr('data-subtext') && !that.multiple) {
+                    subtext = ' <small class="muted">'+$this.data('subtext') +'</small>';
+                } else {
+                    subtext = '';
+                }
+                if ($this.data('content') && that.options.showContent) {
+                    return $this.data('content');
+                } else if ($this.attr('title') != undefined) {
+                    return $this.attr('title');
+                } else {
+                    return icon + $this.html() + subtext;
+                }
+            }).toArray();
+
+            //Fixes issue in IE10 occurring when no default option is selected and at least one option is disabled
+            //Convert all the values into a comma delimited string
+            var title = !this.multiple ? selectedItems[0] : selectedItems.join(", ");
+
+            //If this is multi select, and the selectText type is count, the show 1 of 2 selected etc..
+            if (this.multiple && this.options.selectedTextFormat.indexOf('count') > -1) {
+                var max = this.options.selectedTextFormat.split(">");
+                var notDisabled = this.options.hideDisabled ? ':not([disabled])' : '';
+                if ( (max.length>1 && selectedItems.length > max[1]) || (max.length==1 && selectedItems.length>=2)) {
+                    title = this.options.countSelectedText.replace('{0}', selectedItems.length).replace('{1}', this.$element.find('option:not([data-divider="true"]):not([data-hidden="true"])'+notDisabled).length);
+                }
+             }
+
+            //If we dont have a title, then use the default, or if nothing is set at all, use the not selected text
+            if (!title) {
+                title = this.options.title != undefined ? this.options.title : this.options.noneSelectedText;
+            }
+
+            this.$newElement.find('.filter-option').html(title);
+        },
+
+        setStyle: function(style, status) {
+            if (this.$element.attr('class')) {
+                this.$newElement.addClass(this.$element.attr('class').replace(/selectpicker|mobile-device/gi, ''));
+            }
+
+            var buttonClass = style ? style : this.options.style;
+
+            if (status == 'add') {
+                this.$button.addClass(buttonClass);
+            } else if (status == 'remove') {
+                this.$button.removeClass(buttonClass);
+            } else {
+                this.$button.removeClass(this.options.style);
+                this.$button.addClass(buttonClass);
+            }
+        },
+
+        liHeight: function() {
+            var selectClone = this.$newElement.clone();
+            selectClone.appendTo('body');
+            var $menuClone = selectClone.addClass('open').find('> .dropdown-menu');
+            var liHeight = $menuClone.find('li > a').outerHeight();
+            var headerHeight = this.options.header ? $menuClone.find('.popover-title').outerHeight() : 0;
+            selectClone.remove();
+            this.$newElement.data('liHeight', liHeight).data('headerHeight', headerHeight);
+        },
+
+        setSize: function() {
+            var that = this,
+                menu = this.$menu,
+                menuInner = menu.find('.inner'),
+                menuA = menuInner.find('li > a'),
+                selectHeight = this.$newElement.outerHeight(),
+                liHeight = this.$newElement.data('liHeight'),
+                headerHeight = this.$newElement.data('headerHeight'),
+                divHeight = menu.find('li .divider').outerHeight(true),
+                menuPadding = parseInt(menu.css('padding-top')) +
+                              parseInt(menu.css('padding-bottom')) +
+                              parseInt(menu.css('border-top-width')) +
+                              parseInt(menu.css('border-bottom-width')),
+                notDisabled = this.options.hideDisabled ? ':not(.disabled)' : '',
+                $window = $(window),
+                menuExtras = menuPadding + parseInt(menu.css('margin-top')) + parseInt(menu.css('margin-bottom')) + 2,
+                menuHeight,
+                selectOffsetTop,
+                selectOffsetBot,
+                posVert = function() {
+                    selectOffsetTop = that.$newElement.offset().top - $window.scrollTop();
+                    selectOffsetBot = $window.height() - selectOffsetTop - selectHeight;
+                };
+                posVert();
+                if (this.options.header) menu.css('padding-top', 0);
+
+            if (this.options.size == 'auto') {
+                var getSize = function() {
+                    var minHeight;
+                    posVert();
+                    menuHeight = selectOffsetBot - menuExtras;
+                    that.$newElement.toggleClass('dropup', (selectOffsetTop > selectOffsetBot) && (menuHeight - menuExtras) < menu.height() && that.options.dropupAuto);
+                    if (that.$newElement.hasClass('dropup')) {
+                        menuHeight = selectOffsetTop - menuExtras;
+                    }
+                    if ((menu.find('li').length + menu.find('dt').length) > 3) {
+                        minHeight = liHeight*3 + menuExtras - 2;
+                    } else {
+                        minHeight = 0;
+                    }
+                    menu.css({'max-height' : menuHeight + 'px', 'overflow' : 'hidden', 'min-height' : minHeight + 'px'});
+                    menuInner.css({'max-height' : menuHeight - headerHeight- menuPadding + 'px', 'overflow-y' : 'auto', 'min-height' : minHeight - menuPadding + 'px'});
+                }
+                getSize();
+                $(window).resize(getSize);
+                $(window).scroll(getSize);
+            } else if (this.options.size && this.options.size != 'auto' && menu.find('li'+notDisabled).length > this.options.size) {
+                var optIndex = menu.find("li"+notDisabled+" > *").filter(':not(.div-contain)').slice(0,this.options.size).last().parent().index();
+                var divLength = menu.find("li").slice(0,optIndex + 1).find('.div-contain').length;
+                menuHeight = liHeight*this.options.size + divLength*divHeight + menuPadding;
+                this.$newElement.toggleClass('dropup', (selectOffsetTop > selectOffsetBot) && menuHeight < menu.height() && this.options.dropupAuto);
+                menu.css({'max-height' : menuHeight + headerHeight + 'px', 'overflow' : 'hidden'});
+                menuInner.css({'max-height' : menuHeight - menuPadding + 'px', 'overflow-y' : 'auto'});
+            }
+        },
+
+        setWidth: function() {
+            if (this.options.width == 'auto') {
+                this.$menu.css('min-width', '0');
+
+                // Get correct width if element hidden
+                var selectClone = this.$newElement.clone().appendTo('body');
+                var ulWidth = selectClone.find('> .dropdown-menu').css('width');
+                selectClone.remove();
+
+                this.$newElement.css('width', ulWidth);
+            } else if (this.options.width == 'fit') {
+                // Remove inline min-width so width can be changed from 'auto'
+                this.$menu.css('min-width', '');
+                this.$newElement.css('width', '').addClass('fit-width');
+            } else if (this.options.width) {
+                // Remove inline min-width so width can be changed from 'auto'
+                this.$menu.css('min-width', '');
+                this.$newElement.css('width', this.options.width);
+            } else {
+                // Remove inline min-width/width so width can be changed
+                this.$menu.css('min-width', '');
+                this.$newElement.css('width', '');
+            }
+            // Remove fit-width class if width is changed programmatically
+            if (this.$newElement.hasClass('fit-width') && this.options.width !== 'fit') {
+                this.$newElement.removeClass('fit-width');
+            }
+        },
+
+        selectPosition: function() {
+            var that = this,
+                drop = "<div />",
+                $drop = $(drop),
+                pos,
+                actualHeight,
+                getPlacement = function($element) {
+                    $drop.addClass($element.attr('class')).toggleClass('dropup', $element.hasClass('dropup'));
+                    pos = $element.offset();
+                    actualHeight = $element.hasClass('dropup') ? 0 : $element[0].offsetHeight;
+                    $drop.css({'top' : pos.top + actualHeight, 'left' : pos.left, 'width' : $element[0].offsetWidth, 'position' : 'absolute'});
+                };
+            this.$newElement.on('click', function(e) {
+                getPlacement($(this));
+                $drop.appendTo(that.options.container);
+                $drop.toggleClass('open', !$(this).hasClass('open'));
+                $drop.append(that.$menu);
+            });
+            $(window).resize(function() {
+                getPlacement(that.$newElement);
+            });
+            $(window).on('scroll', function(e) {
+                getPlacement(that.$newElement);
+            });
+            $('html').on('click', function(e) {
+                if ($(e.target).closest(that.$newElement).length < 1) {
+                    $drop.removeClass('open');
+                }
+            });
+        },
+
+        mobile: function() {
+            this.$element.addClass('mobile-device').appendTo(this.$newElement);
+            if (this.options.container) this.$menu.hide();
+        },
+
+        refresh: function() {
+            this.reloadLi();
+            this.render();
+            this.setWidth();
+            this.setStyle();
+            this.checkDisabled();
+            this.liHeight();
+        },
+
+        setSelected: function(index, selected) {
+            this.$menu.find('li').eq(index).toggleClass('selected', selected);
+        },
+
+        setDisabled: function(index, disabled) {
+            if (disabled) {
+                this.$menu.find('li').eq(index).addClass('disabled').find('a').attr('href','#').attr('tabindex',-1);
+            } else {
+                this.$menu.find('li').eq(index).removeClass('disabled').find('a').removeAttr('href').attr('tabindex',0);
+            }
+        },
+
+        isDisabled: function() {
+            return this.$element.is(':disabled');
+        },
+
+        checkDisabled: function() {
+            var that = this;
+            if (this.isDisabled()) {
+                this.$button.addClass('disabled');
+                this.$button.attr('tabindex','-1');
+            } else if (this.$button.hasClass('disabled')) {
+                this.$button.removeClass('disabled');
+                this.$button.removeAttr('tabindex');
+            }
+            this.$button.click(function() {
+                return !that.isDisabled();
+            });
+        },
+
+        checkTabIndex: function() {
+            if (this.$element.is('[tabindex]')) {
+                var tabindex = this.$element.attr("tabindex");
+                this.$button.attr('tabindex', tabindex);
+            }
+        },
+
+        clickListener: function() {
+            var that = this;
+
+            $('body').on('touchstart.dropdown', '.dropdown-menu', function(e) {
+                e.stopPropagation();
+            });
+
+            this.$newElement.on('click', function() {
+                that.setSize();
+            });
+
+            this.$menu.on('click', 'li a', function(e) {
+                var clickedIndex = $(this).parent().index(),
+                    $this = $(this).parent(),
+                    prevValue = that.$element.val();
+
+                //Dont close on multi choice menu
+                if (that.multiple) {
+                    e.stopPropagation();
+                }
+
+                e.preventDefault();
+
+                //Dont run if we have been disabled
+                if (!that.isDisabled() && !$(this).parent().hasClass('disabled')) {
+                    var $options = that.$element.find('option');
+                    var $option = $options.eq(clickedIndex);
+
+                    //Deselect all others if not multi select box
+                    if (!that.multiple) {
+                        $options.prop('selected', false);
+                        $option.prop('selected', true);
+                    }
+                    //Else toggle the one we have chosen if we are multi select.
+                    else {
+                        var state = $option.prop('selected');
+
+                        $option.prop('selected', !state);
+                    }
+
+                    that.$button.focus();
+
+                    // Trigger select 'change'
+                    if (prevValue != that.$element.val()) {
+                        that.$element.change();
+                    }
+                }
+            });
+
+            this.$menu.on('click', 'li.disabled a, li dt, li .div-contain, h3.popover-title', function(e) {
+                if (e.target == this) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    that.$button.focus();
+                }
+            });
+
+            this.$searchbox.on('click', function(e) {
+                e.stopPropagation();
+            });
+
+            this.$element.change(function() {
+                that.render()
+            });
+        },
+
+        liveSearchListener: function() {
+            var that = this;
+
+            this.$newElement.on('click.dropdown.data-api', function(e){
+                if(that.options.liveSearch) {
+                    setTimeout(function() {
+                        that.$searchbox.focus();
+                    }, 10);
+                }
+            });
+
+            this.$searchbox.on('input', function() {
+                that.$newElement.find('li').show().not(':icontains(' + that.$searchbox.val() + ')').hide();
+            });
+        },
+
+        val: function(value) {
+
+            if (value != undefined) {
+                this.$element.val( value );
+
+                this.$element.change();
+                return this.$element;
+            } else {
+                return this.$element.val();
+            }
+        },
+
+        selectAll: function() {
+            this.$element.find('option').prop('selected', true).attr('selected', 'selected');
+            this.render();
+        },
+
+        deselectAll: function() {
+            this.$element.find('option').prop('selected', false).removeAttr('selected');
+            this.render();
+        },
+
+        keydown: function(e) {
+            var $this,
+                $items,
+                $parent,
+                index,
+                next,
+                first,
+                last,
+                prev,
+                nextPrev,
+                that;
+
+            $this = $(this);
+
+            $parent = $this.parent();
+
+            that = $parent.data('this');
+
+            if (that.options.container) $parent = that.$menu;
+
+            $items = $('[role=menu] li:not(.divider):visible a', $parent);
+
+            if (!$items.length) return;
+
+            if (/(38|40)/.test(e.keyCode)) {
+
+                index = $items.index($items.filter(':focus'));
+                first = $items.parent(':not(.disabled)').first().index();
+                last = $items.parent(':not(.disabled)').last().index();
+                next = $items.eq(index).parent().nextAll(':not(.disabled)').eq(0).index();
+                prev = $items.eq(index).parent().prevAll(':not(.disabled)').eq(0).index();
+                nextPrev = $items.eq(next).parent().prevAll(':not(.disabled)').eq(0).index();
+
+                if (e.keyCode == 38) {
+                    if (index != nextPrev && index > prev) index = prev;
+                    if (index < first) index = first;
+                }
+
+                if (e.keyCode == 40) {
+                    if (index != nextPrev && index < next) index = next;
+                    if (index > last) index = last;
+                    if (index == -1) index = 0;
+                }
+
+                $items.eq(index).focus();
+            } else {
+                var keyCodeMap = {
+                    48:"0", 49:"1", 50:"2", 51:"3", 52:"4", 53:"5", 54:"6", 55:"7", 56:"8", 57:"9", 59:";",
+                    65:"a", 66:"b", 67:"c", 68:"d", 69:"e", 70:"f", 71:"g", 72:"h", 73:"i", 74:"j", 75:"k", 76:"l",
+                    77:"m", 78:"n", 79:"o", 80:"p", 81:"q", 82:"r", 83:"s", 84:"t", 85:"u", 86:"v", 87:"w", 88:"x", 89:"y", 90:"z",
+                    96:"0", 97:"1", 98:"2", 99:"3", 100:"4", 101:"5", 102:"6", 103:"7", 104:"8", 105:"9"
+                }
+
+                var keyIndex = [];
+
+                $items.each(function() {
+                    if ($(this).parent().is(':not(.disabled)')) {
+                        if ($.trim($(this).text().toLowerCase()).substring(0,1) == keyCodeMap[e.keyCode]) {
+                            keyIndex.push($(this).parent().index());
+                        }
+                    }
+                });
+
+                var count = $(document).data('keycount');
+                count++;
+                $(document).data('keycount',count);
+
+                var prevKey = $.trim($(':focus').text().toLowerCase()).substring(0,1);
+
+                if (prevKey != keyCodeMap[e.keyCode]) {
+                    count = 1;
+                    $(document).data('keycount',count);
+                } else if (count >= keyIndex.length) {
+                    $(document).data('keycount',0);
+                }
+
+                $items.eq(keyIndex[count - 1]).focus();
+            }
+
+            // select focused option if "Enter" or "Spacebar" are pressed
+            if (/(13|32)/.test(e.keyCode)) {
+                e.preventDefault();
+                $(':focus').click();
+                $(document).data('keycount',0);
+            }
+        },
+
+        hide: function() {
+            this.$newElement.hide();
+        },
+
+        show: function() {
+            this.$newElement.show();
+        },
+
+        destroy: function() {
+            this.$newElement.remove();
+            this.$element.remove();
+        }
+    };
+
+    $.fn.selectpicker = function(option, event) {
+       //get the args of the outer function..
+       var args = arguments;
+       var value;
+       var chain = this.each(function() {
+            if ($(this).is('select')) {
+                var $this = $(this),
+                    data = $this.data('selectpicker'),
+                    options = typeof option == 'object' && option;
+
+                if (!data) {
+                    $this.data('selectpicker', (data = new Selectpicker(this, options, event)));
+                } else if (options) {
+                    for(var i in options) {
+                       data.options[i] = options[i];
+                    }
+                }
+
+                if (typeof option == 'string') {
+                    //Copy the value of option, as once we shift the arguments
+                    //it also shifts the value of option.
+                    var property = option;
+                    if (data[property] instanceof Function) {
+                        [].shift.apply(args);
+                        value = data[property].apply(data, args);
+                    } else {
+                        value = data.options[property];
+                    }
+                }
+            }
+        });
+
+        if (value != undefined) {
+            return value;
+        } else {
+            return chain;
+        }
+    };
+
+    $.fn.selectpicker.defaults = {
+        style: 'btn-default',
+        size: 'auto',
+        title: null,
+        selectedTextFormat : 'values',
+        noneSelectedText : 'Nothing selected',
+        countSelectedText: '{0} of {1} selected',
+        width: false,
+        container: false,
+        hideDisabled: false,
+        showSubtext: false,
+        showIcon: true,
+        showContent: true,
+        dropupAuto: true,
+        header: false,
+        liveSearch: false
+    }
+
+    $(document)
+        .data('keycount', 0)
+        .on('keydown', '[data-toggle=dropdown], [role=menu]' , Selectpicker.prototype.keydown)
+
+}(window.jQuery);
diff --git a/templates/admin/default/assets/js/main.js b/templates/admin/default/assets/js/main.js
index 094dfe623..1c7c3f2be 100644
--- a/templates/admin/default/assets/js/main.js
+++ b/templates/admin/default/assets/js/main.js
@@ -47,6 +47,11 @@
             $('[rel="tooltip"]').tooltip();
         }
 
+        // -- Bootstrap select --
+        if($('[data-toggle="selectpicker"]').length){            
+            $('[data-toggle="selectpicker"]').selectpicker();
+        }
+
         // -- Confirm Box --
         if($('[data-toggle="confirm"]').length){
             $('[data-toggle="confirm"]').click(function(e){		
diff --git a/templates/admin/default/assets/less/thelia/bootstrap-select.less b/templates/admin/default/assets/less/thelia/bootstrap-select.less
new file mode 100644
index 000000000..10d019be5
--- /dev/null
+++ b/templates/admin/default/assets/less/thelia/bootstrap-select.less
@@ -0,0 +1,269 @@
+/*!
+ * bootstrap-select v1.3.1
+ * http://silviomoreto.github.io/bootstrap-select/
+ *
+ * Copyright 2013 bootstrap-select
+ * Licensed under the MIT license
+ */
+
+ .input-group{
+
+    .bootstrap-select.btn-group,
+    .bootstrap-select.btn-group[class*="span"] {
+        width: 100%;
+        margin-bottom: 0;
+
+        .btn{
+            .border-right-radius(0);
+        }
+    }
+
+ }
+
+.bootstrap-select.btn-group,
+.bootstrap-select.btn-group[class*="span"] {
+    float: none;
+    display: inline-block;
+    margin-bottom: 10px;
+    margin-left: 0;
+}
+.form-search .bootstrap-select.btn-group,
+.form-inline .bootstrap-select.btn-group,
+.form-horizontal .bootstrap-select.btn-group {
+    margin-bottom: 0;
+}
+
+.bootstrap-select.btn-group.pull-right,
+.bootstrap-select.btn-group[class*="span"].pull-right,
+.row-fluid .bootstrap-select.btn-group[class*="span"].pull-right {
+    float: right;
+}
+
+.input-append .bootstrap-select.btn-group {
+    margin-left: -1px;
+}
+
+.input-prepend .bootstrap-select.btn-group {
+    margin-right: -1px;
+}
+
+.bootstrap-select:not([class*="span"]) {
+    width: 220px;
+}
+
+.bootstrap-select {
+    /*width: 220px\9; IE8 and below*/
+    width: 220px\0; /*IE9 and below*/
+}
+
+.bootstrap-select > .btn {
+    width: 100%;
+}
+
+.error .bootstrap-select .btn {
+    border: 1px solid #b94a48;
+}
+
+
+.dropdown-menu {
+  z-index: 2000;
+}
+
+.bootstrap-select.show-menu-arrow.open > .btn {
+    z-index: 2051;
+}
+
+.bootstrap-select.btn-group .btn .filter-option {
+    overflow: hidden;
+    position: absolute;
+    left: 12px;
+    right: 25px;
+    text-align: left;
+}
+
+.bootstrap-select.btn-group .btn .caret {
+    position: absolute;
+    top: 50%;
+    right: 12px;
+    margin-top: -2px;
+    vertical-align: middle;
+}
+
+.bootstrap-select.btn-group > .disabled,
+.bootstrap-select.btn-group .dropdown-menu li.disabled > a {
+    cursor: not-allowed;
+}
+
+.bootstrap-select.btn-group > .disabled:focus {
+    outline: none !important;
+}
+
+.bootstrap-select.btn-group[class*="span"] .btn {
+    width: 100%;
+}
+
+.bootstrap-select.btn-group .dropdown-menu {
+    min-width: 100%;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+.bootstrap-select.btn-group .dropdown-menu.inner {
+    position: static;
+    border: 0;
+    padding: 0;
+    margin: 0;
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+    -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+            box-shadow: none;
+}
+
+.bootstrap-select.btn-group .dropdown-menu dt {
+    display: block;
+    padding: 3px 20px;
+    cursor: default;
+}
+
+.bootstrap-select.btn-group .div-contain {
+    overflow: hidden;
+}
+
+.bootstrap-select.btn-group .dropdown-menu li {
+    position: relative;
+
+    &:focus, a:focus{
+        outline: none;
+    }
+}
+
+.bootstrap-select.btn-group .dropdown-menu li > a.opt {
+    position: relative;
+    padding-left: 35px;
+}
+
+.bootstrap-select.btn-group .dropdown-menu li > a {
+    cursor: pointer;
+}
+
+.bootstrap-select.btn-group .dropdown-menu li > dt small {
+    font-weight: normal;
+}
+
+.bootstrap-select.btn-group.show-tick .dropdown-menu li.selected a i.check-mark {
+    display: inline-block;
+    position: absolute;
+    right: 15px;
+    margin-top: 2.5px;
+}
+
+.bootstrap-select.btn-group .dropdown-menu li a i.check-mark {
+    display: none;
+}
+
+.bootstrap-select.btn-group.show-tick .dropdown-menu li a span.text {
+    margin-right: 34px;
+}
+
+.bootstrap-select.btn-group .dropdown-menu li small {
+    padding-left: 0.5em;
+}
+
+.bootstrap-select.btn-group .dropdown-menu li:not(.disabled) > a:hover small,
+.bootstrap-select.btn-group .dropdown-menu li:not(.disabled) > a:focus small {
+    color: #64b1d8;
+    color: rgba(255,255,255,0.4);
+}
+
+.bootstrap-select.btn-group .dropdown-menu li > dt small {
+    font-weight: normal;
+}
+
+.bootstrap-select.show-menu-arrow .dropdown-toggle:before {
+    content: '';
+    display: inline-block;
+    border-left: 7px solid transparent;
+    border-right: 7px solid transparent;
+    border-bottom: 7px solid #CCC;
+    border-bottom-color: rgba(0, 0, 0, 0.2);
+    position: absolute;
+    bottom: -4px;
+    left: 9px;
+    display: none;
+}
+
+.bootstrap-select.show-menu-arrow .dropdown-toggle:after {
+    content: '';
+    display: inline-block;
+    border-left: 6px solid transparent;
+    border-right: 6px solid transparent;
+    border-bottom: 6px solid white;
+    position: absolute;
+    bottom: -4px;
+    left: 10px;
+    display: none;
+}
+
+.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:before {
+  bottom: auto;
+  top: -3px;
+  border-top: 7px solid #ccc;
+  border-bottom: 0;
+  border-top-color: rgba(0, 0, 0, 0.2);
+}
+
+.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:after {
+  bottom: auto;
+  top: -3px;
+  border-top: 6px solid #ffffff;
+  border-bottom: 0;
+}
+
+.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:before {
+    right: 12px;
+    left: auto;
+}
+.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:after {
+    right: 13px;
+    left: auto;
+}
+
+.bootstrap-select.show-menu-arrow.open > .dropdown-toggle:before,
+.bootstrap-select.show-menu-arrow.open > .dropdown-toggle:after {
+    display: block;
+}
+
+.mobile-device {
+    position: absolute;
+    top: 0;
+    left: 0;
+    display: block !important;
+    width: 100%;
+    height: 100% !important;
+    opacity: 0;
+}
+
+.bootstrap-select.fit-width {
+    width: auto !important;
+}
+
+.bootstrap-select.btn-group.fit-width .btn .filter-option {
+    position: static;
+}
+
+.bootstrap-select.btn-group.fit-width .btn .caret {
+    position: static;
+    top: auto;
+    margin-top: -1px;
+}
+
+.control-group.error .bootstrap-select .dropdown-toggle{
+    border-color: #b94a48;
+}
+
+.bootstrap-select-searchbox {
+    padding: 4px 8px;
+}
diff --git a/templates/admin/default/assets/less/thelia/thelia.less b/templates/admin/default/assets/less/thelia/thelia.less
index ba1654c7c..466f9d419 100644
--- a/templates/admin/default/assets/less/thelia/thelia.less
+++ b/templates/admin/default/assets/less/thelia/thelia.less
@@ -11,6 +11,7 @@
 @import "wizard.less";
 @import "bootstrap-editable.less";
 @import "bootstrap-switch.less";
+@import "bootstrap-select.less";
 @import "jqplot.less";
 
 // -- Base styling ------------------------------------------------------------
diff --git a/templates/admin/default/shipping-configuration-edit.html b/templates/admin/default/shipping-configuration-edit.html
new file mode 100644
index 000000000..39b69dcde
--- /dev/null
+++ b/templates/admin/default/shipping-configuration-edit.html
@@ -0,0 +1,136 @@
+{extends file="admin-layout.tpl"}
+
+{block name="page-title"}{intl l='Edit a shipping configuration'}{/block}
+
+{block name="check-permissions"}admin.configuration.shipping-configuration.edit{/block}
+
+{block name="main-content"}
+<div class="shipping-configuration edit-shipping-configuration">
+
+    <div id="wrapper" class="container">
+
+        <ul class="breadcrumb">
+            <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
+            <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
+            <li><a href="{url path='/admin/configuration/shipping_configuration'}">{intl l="Shipping configuration"}</a></li>
+            <li>{intl l='Editing shipping configuration "%name"' name="{$TITLE}"}</li>
+        </ul>
+
+        <div class="row">
+            <div class="col-md-12">
+                <div class="general-block-decorator">
+                    
+                    <div class="col-md-12 title title-without-tabs">
+                        {intl l='Edit shipping configuration %title' title=$TITLE}
+                    </div>
+
+                    <div class="form-container clearfix">
+                        <div class="col-md-4">
+                            
+                            
+
+                            <form method="POST" action="">
+                                <label class="control-label" for="">{intl l="Country"}</label>
+
+                                <div class="input-group">                                                            
+                                    <select name="" id="" data-toggle="selectpicker">
+                                        <option value="1">France</option>
+                                        <option value="2">Monaco</option>
+                                        <option value="3">Nouvelle-Calédonie</option>
+                                    </select>
+                                    <span class="input-group-btn">
+                                        <button type="submit" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-plus-sign"></span> {intl l="Add this country"}</button>
+                                    </span>
+                                </div>                                    
+                                
+                            </form>
+                            
+                        </div>
+
+                        <div class="col-md-8">
+                            <table class="table table-striped table-condensed">
+                                <thead>
+                                    <tr>
+                                        <th>{intl l="Country"}</th>
+                                        <th>{intl l="Actions"}</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr>
+                                        <td>Wallis-et-Futuna</td>
+                                        <td>
+                                            <a class="btn btn-default btn-xs" title="{intl l='Delete this country'}"  href="#delete_country_dialog" data-id="{$ID}" data-toggle="modal">
+                                                <span class="glyphicon glyphicon-trash"></span>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>Polynésie française</td>
+                                        <td>
+                                            <a class="btn btn-default btn-xs" title="{intl l='Delete this country'}"  href="#delete_country_dialog" data-id="{$ID}" data-toggle="modal">
+                                                <span class="glyphicon glyphicon-trash"></span>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>USA - Alabama</td>
+                                        <td>
+                                            <a class="btn btn-default btn-xs" title="{intl l='Delete this country'}"  href="#delete_zone_dialog" data-id="{$ID}" data-toggle="modal">
+                                                <span class="glyphicon glyphicon-trash"></span>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                                <tfoot>
+                                    <tr class="active">
+                                        <td colspan="2">
+                                            <form method="POST" action="">
+                                                <label for="" class="control-label">{intl l="Freight"}</label>
+                                                <div class="input-group">
+                                                    <input type="text" class="form-control" name="" id="" placeholder="Freight value">
+                                                    <span class="input-group-addon">&euro;</span>
+                                                    <span class="input-group-btn">
+                                                        <button type="submit" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-check"></span></button>
+                                                    </span>
+                                                </div>
+                                            </form>
+                                        </td>
+                                    </tr>
+                                </tfoot>
+                            </table>
+                        </div>
+                    </div>
+                    
+                </div>
+            </div>
+        </div>
+
+    </div>
+</div>  
+
+    {* Delete related content confirmation dialog *}
+
+    {capture "delete_country_dialog"}
+        
+    {/capture}
+
+    {include
+        file = "includes/generic-confirm-dialog.html"
+
+        dialog_id       = "delete_country_dialog"
+        dialog_title    = {intl l="Remove country"}
+        dialog_message  = {intl l="Do you really want to remove this country ?"}
+
+        form_action     = {url path=''}
+        form_content    = {$smarty.capture.delete_country_dialog nofilter}
+    }  
+{/block}
+
+{block name="javascript-initialization"}
+    {javascripts file='assets/js/main.js'}
+        <script src="{$asset_url}"></script>        
+    {/javascripts}
+    {javascripts file='assets/js/bootstrap-select/bootstrap-select.js'}
+        <script src="{$asset_url}"></script>        
+    {/javascripts}
+{/block}
\ No newline at end of file
diff --git a/templates/admin/default/shipping-zones-edit.html b/templates/admin/default/shipping-zones-edit.html
index cdb9886bf..70ee29a35 100644
--- a/templates/admin/default/shipping-zones-edit.html
+++ b/templates/admin/default/shipping-zones-edit.html
@@ -12,7 +12,7 @@
         <ul class="breadcrumb">
             <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
             <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
-            <li><a href="{url path='/admin/configuration/shipping-zones'}">{intl l="Shipping zones"}</a></li>
+            <li><a href="{url path='/admin/configuration/shipping_zones'}">{intl l="Shipping zones"}</a></li>
             <li>{intl l='Editing shipping zone "%name"' name="{$TITLE}"}</li>
         </ul>
 
@@ -31,7 +31,7 @@
                                 <label class="control-label" for="">{intl l="Zones"}</label>
 
                                 <div class="input-group">                                    
-                                    <select name="" id="" class="form-control">
+                                    <select name="" id="" data-toggle="selectpicker">
                                         <option value="">1</option>
                                         <option value="">2</option>
                                         <option value="">3</option>
@@ -108,4 +108,13 @@
         form_action     = {url path=''}
         form_content    = {$smarty.capture.delete_zone_dialog nofilter}
     }  
+{/block}
+
+{block name="javascript-initialization"}
+    {javascripts file='assets/js/main.js'}
+        <script src="{$asset_url}"></script>        
+    {/javascripts}
+    {javascripts file='assets/js/bootstrap-select/bootstrap-select.js'}
+        <script src="{$asset_url}"></script>        
+    {/javascripts}
 {/block}
\ No newline at end of file
diff --git a/templates/admin/default/shipping-zones.html b/templates/admin/default/shipping-zones.html
index 9cb7fbc59..e7c624b52 100644
--- a/templates/admin/default/shipping-zones.html
+++ b/templates/admin/default/shipping-zones.html
@@ -12,7 +12,7 @@
         <ul class="breadcrumb">
             <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
             <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
-            <li><a href="{url path='/admin/configuration/shipping-zones'}">{intl l="Shipping zones"}</a></li>
+            <li><a href="{url path='/admin/configuration/shipping_zones'}">{intl l="Shipping zones"}</a></li>
         </ul>
 
         {module_include location='shipping_zones_top'}

From 5a79c6c016340f1ee1b51ca3bf6fa50d6a754891 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Thu, 19 Sep 2013 12:45:02 +0200
Subject: [PATCH 06/51] force_return as default value tue in Image loop

---
 core/lib/Thelia/Core/Template/Loop/Image.php |  3 ++-
 templates/default/index.html                 |  4 ++--
 templates/default/product.html               | 11 +++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Loop/Image.php b/core/lib/Thelia/Core/Template/Loop/Image.php
index 6a3dbfee1..a62f23702 100755
--- a/core/lib/Thelia/Core/Template/Loop/Image.php
+++ b/core/lib/Thelia/Core/Template/Loop/Image.php
@@ -93,7 +93,8 @@ class Image extends BaseI18nLoop
                                 new EnumType($this->possible_sources)
                         )
                 ),
-                Argument::createIntTypeArgument('source_id')
+                Argument::createIntTypeArgument('source_id'),
+                Argument::createBooleanTypeArgument('force_return', true)
         );
 
         // Add possible image sources
diff --git a/templates/default/index.html b/templates/default/index.html
index 36207f5e0..b762df42f 100644
--- a/templates/default/index.html
+++ b/templates/default/index.html
@@ -40,7 +40,7 @@
                         <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
                             {ifloop rel="image_product_new" }
                                 <img itemprop="image"
-                            {loop name="image_product_new" type="image" limit="1" product="{$ID}" force_return="1" width="280" height="196" resize_mode="borders"}
+                            {loop name="image_product_new" type="image" limit="1" product="{$ID}" force_return="true" width="280" height="196" resize_mode="borders"}
                                 src="{$IMAGE_URL}"
                             {/loop}
                                 alt="Product #{$LOOP_COUNT}" >
@@ -99,7 +99,7 @@
                         <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
                             {ifloop rel="image_product_promo" }
                             <img itemprop="image"
-                                    {loop name="image_product_promo" type="image" limit="1" product="{$ID}" force_return="1" width="218" height="146" resize_mode="borders"}
+                                    {loop name="image_product_promo" type="image" limit="1" product="{$ID}" width="218" height="146" resize_mode="borders"}
                                         src="{$IMAGE_URL}"
                                     {/loop}
                                  alt="Product #{$LOOP_COUNT}" >
diff --git a/templates/default/product.html b/templates/default/product.html
index 329f674cd..2a7e81bc4 100644
--- a/templates/default/product.html
+++ b/templates/default/product.html
@@ -23,8 +23,7 @@
 
             <section id="product-gallery">
                 <figure class="product-image">
-                    {lang attr="id"} {lang attr="title"}
-                    {loop type="image" name="image.main" product="{$ID}" width="560" height="445" resize_mode="borders" limit="1" force_return="true"}
+                    {loop type="image" name="image.main" product="{$ID}" width="560" height="445" resize_mode="borders" limit="1"}
                         <img src="{$IMAGE_URL}" alt="{$TITLE}" class="img-responsive" itemprop="image" data-toggle="magnify">
                     {/loop}
                 </figure>
@@ -33,10 +32,10 @@
                     <div class="carousel-inner">
                         <div class="item active">
                             <ul>
-                                {loop name="image.carousel" type="image" product="{$ID}"  width="560" height="445" resize_mode="borders" limit="5" force_return="true"}
+                                {loop name="image.carousel" type="image" product="{$ID}"  width="560" height="445" resize_mode="borders" limit="5"}
                                 <li>
                                     <a href="{$IMAGE_URL}" class="thumbnail {if $LOOP_COUNT == 1}active{/if}">
-                                        {loop type="image" name="image.thumbs" id="{$ID}" product="$OBJECT_ID" width="118" height="85" resize_mode="borders" force_return="true"}
+                                        {loop type="image" name="image.thumbs" id="{$ID}" product="$OBJECT_ID" width="118" height="85" resize_mode="borders"}
                                             <img src="{$IMAGE_URL}" alt="{$TITLE}">
                                         {/loop}
                                     </a>
@@ -48,10 +47,10 @@
                         <div class="item">
                             <ul>
 
-                                {loop name="image.carouselsup" type="image" product="{$ID}"  width="560" height="445" resize_mode="crop" offset="5" force_return="true"}
+                                {loop name="image.carouselsup" type="image" product="{$ID}"  width="560" height="445" resize_mode="crop" offset="5"}
                                     <li>
                                         <a href="{$IMAGE_URL}" class="thumbnail">
-                                            {loop type="image" name="image.thumbssup" id="{$ID}" product="$OBJECT_ID" width="118" height="85" resize_mode="crop" force_return="true"}
+                                            {loop type="image" name="image.thumbssup" id="{$ID}" product="$OBJECT_ID" width="118" height="85" resize_mode="crop"}
                                                 <img src="{$IMAGE_URL}" alt="{$TITLE}">
                                             {/loop}
                                         </a>

From 260fc5b51ad0c5497475def58ec0e4e97694bcc0 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Thu, 19 Sep 2013 12:47:56 +0200
Subject: [PATCH 07/51] Width 100% on bootstrap-select

---
 .../admin/default/assets/less/thelia/bootstrap-select.less    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/admin/default/assets/less/thelia/bootstrap-select.less b/templates/admin/default/assets/less/thelia/bootstrap-select.less
index 10d019be5..9c5f1fc28 100644
--- a/templates/admin/default/assets/less/thelia/bootstrap-select.less
+++ b/templates/admin/default/assets/less/thelia/bootstrap-select.less
@@ -48,12 +48,12 @@
 }
 
 .bootstrap-select:not([class*="span"]) {
-    width: 220px;
+    width: 100%;
 }
 
 .bootstrap-select {
     /*width: 220px\9; IE8 and below*/
-    width: 220px\0; /*IE9 and below*/
+    width: 100%\0; /*IE9 and below*/
 }
 
 .bootstrap-select > .btn {

From 2640794af714ac84b9c036b7bf2ceb959e7fb743 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Thu, 19 Sep 2013 13:21:42 +0200
Subject: [PATCH 08/51] Change properties of bootstrap-select field

---
 .../assets/less/thelia/bootstrap-select.less  | 14 ++++++---
 .../default/assets/less/thelia/forms.less     | 30 +++++++++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/templates/admin/default/assets/less/thelia/bootstrap-select.less b/templates/admin/default/assets/less/thelia/bootstrap-select.less
index 9c5f1fc28..5fb302a33 100644
--- a/templates/admin/default/assets/less/thelia/bootstrap-select.less
+++ b/templates/admin/default/assets/less/thelia/bootstrap-select.less
@@ -58,10 +58,7 @@
 
 .bootstrap-select > .btn {
     width: 100%;
-}
-
-.error .bootstrap-select .btn {
-    border: 1px solid #b94a48;
+    .form-control-focus();
 }
 
 
@@ -79,6 +76,7 @@
     left: 12px;
     right: 25px;
     text-align: left;
+    color: @input-color;
 }
 
 .bootstrap-select.btn-group .btn .caret {
@@ -132,6 +130,14 @@
     overflow: hidden;
 }
 
+.bootstrap-select.btn-group .dropdown-menu li a{
+    color: @input-color;
+
+    &:hover{
+        color: #FFF;
+    }
+}
+
 .bootstrap-select.btn-group .dropdown-menu li {
     position: relative;
 
diff --git a/templates/admin/default/assets/less/thelia/forms.less b/templates/admin/default/assets/less/thelia/forms.less
index 52c4b5b54..2291c15e9 100755
--- a/templates/admin/default/assets/less/thelia/forms.less
+++ b/templates/admin/default/assets/less/thelia/forms.less
@@ -167,6 +167,36 @@ form .info {
     }
 }
 
+// Form validation states
+//
+// Used in forms.less to generate the form validation CSS for warnings, errors,
+// and successes.
+
+.form-control-validation(@text-color: #555; @border-color: #ccc; @background-color: #f5f5f5) {
+  // Color the label and help text
+  .help-block,
+  .control-label {
+    color: @text-color;
+  }
+  // Set the border and box shadow on specific inputs to match
+  .form-control, .bootstrap-select .btn {
+    border-color: @border-color;
+    .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
+    &:focus {
+      border-color: darken(@border-color, 10%);
+      @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%);
+      .box-shadow(@shadow);
+    }
+  }
+  // Set validation states also for addons
+  .input-group-addon {
+    color: @text-color;
+    border-color: @border-color;
+    background-color: @background-color;
+  }
+}
+
+
 // -- Sign in --
 .form-signin{
     // .form-control {

From 94aab3ea8a055d0174a29ae83421aa70f68da6ab Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Thu, 19 Sep 2013 13:27:47 +0200
Subject: [PATCH 09/51] Add modules routing and default action/view

---
 .../Thelia/Config/Resources/routing/admin.xml |  9 ++++
 .../Controller/Admin/ModuleController.php     | 46 +++++++++++++++++++
 templates/admin/default/modules.html          |  0
 3 files changed, 55 insertions(+)
 create mode 100644 core/lib/Thelia/Controller/Admin/ModuleController.php
 create mode 100644 templates/admin/default/modules.html

diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index af7b7e445..e09d24a90 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -487,6 +487,15 @@
 
     <!-- end feature and feature routes  management -->
 
+    <!-- Modules rule management -->
+
+    <route id="admin.module" path="/admin/modules">
+        <default key="_controller">Thelia\Controller\Admin\ModuleController::indexAction</default>
+    </route>
+
+    <!-- end Modules rule management -->
+
+
 	<!-- The default route, to display a template -->
 
     <route id="admin.processTemplate" path="/admin/{template}">
diff --git a/core/lib/Thelia/Controller/Admin/ModuleController.php b/core/lib/Thelia/Controller/Admin/ModuleController.php
new file mode 100644
index 000000000..fe794abf9
--- /dev/null
+++ b/core/lib/Thelia/Controller/Admin/ModuleController.php
@@ -0,0 +1,46 @@
+<?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\Controller\Admin;
+
+/**
+ * Class ModuleController
+ * @package Thelia\Controller\Admin
+ * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ */
+class ModuleController extends BaseAdminController
+{
+    public function indexAction()
+    {
+        if (null !== $response = $this->checkAuth("admin.module.view")) return $response;
+        return $this->render("modules", array("display_module" => 20));
+    }
+    
+    public function updateAction($module_id)
+    {
+
+    	return $this->render("module-edit", array(
+    		"module_id" => $module_id
+    	));
+    }
+}
\ No newline at end of file
diff --git a/templates/admin/default/modules.html b/templates/admin/default/modules.html
new file mode 100644
index 000000000..e69de29bb

From e6d8e098861e036d73db35d699810004c520522d Mon Sep 17 00:00:00 2001
From: franck <franck@cqfdev.fr>
Date: Thu, 19 Sep 2013 14:02:56 +0200
Subject: [PATCH 10/51] Added product edition routing

---
 core/lib/Thelia/Config/Resources/config.xml   |  1 +
 .../Thelia/Config/Resources/routing/admin.xml | 20 ++++++++++++++++++-
 install/insert.sql                            |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 1ecd8a649..5fdefc096 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -31,6 +31,7 @@
         <loop class="Thelia\Core\Template\Loop\Title" name="title"/>
         <loop class="Thelia\Core\Template\Loop\Lang" name="lang"/>
         <loop class="Thelia\Core\Template\Loop\CategoryTree" name="category-tree"/>
+        <loop class="Thelia\Core\Template\Loop\FolderTree" name="folder-tree"/>
         <loop class="Thelia\Core\Template\Loop\Cart" name="cart"/>
         <loop class="Thelia\Core\Template\Loop\Image" name="image"/>
         <loop class="Thelia\Core\Template\Loop\Config" name="config"/>
diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index 50b622451..42be03276 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -144,6 +144,8 @@
         <default key="_controller">Thelia\Controller\Admin\ProductController::updatePositionAction</default>
     </route>
 
+    <!-- Related content -->
+
     <route id="admin.products.related-content.add" path="/admin/products/related-content/add">
         <default key="_controller">Thelia\Controller\Admin\ProductController::addRelatedContentAction</default>
     </route>
@@ -156,7 +158,23 @@
         <default key="_controller">Thelia\Controller\Admin\ProductController::getAvailableRelatedContentAction</default>
         <requirement key="_format">xml|json</requirement>
     </route>
-    
+
+    <!-- Product accessories -->
+
+    <route id="admin.products.accessories.add" path="/admin/products/accessory/add">
+        <default key="_controller">Thelia\Controller\Admin\ProductController::addAccessoryAction</default>
+    </route>
+
+    <route id="admin.products.accessories.delete" path="/admin/products/accessory/delete">
+        <default key="_controller">Thelia\Controller\Admin\ProductController::deleteAccessoryAction</default>
+    </route>
+
+    <route id="admin.product.accessories-content" path="/admin/product/{productId}/available-accessories/{categoryId}.{_format}" methods="GET">
+        <default key="_controller">Thelia\Controller\Admin\ProductController::getAvailableAccessoriesAction</default>
+        <requirement key="_format">xml|json</requirement>
+    </route>
+
+
     <!--  Folder routes management -->
     <route id="admin.folders.default" path="/admin/folders">
         <default key="_controller">Thelia\Controller\Admin\FolderController::indexAction</default>
diff --git a/install/insert.sql b/install/insert.sql
index 9680abd28..b6c98f071 100755
--- a/install/insert.sql
+++ b/install/insert.sql
@@ -27,7 +27,7 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
 ('thelia_admin_remember_me_cookie_expiration', 2592000, 0, 0, NOW(), NOW()),
 ('thelia_customer_remember_me_cookie_name', 'tcrmcn', 0, 0, NOW(), NOW()),
 ('thelia_customer_remember_me_cookie_expiration', 31536000, 0, 0, NOW(), NOW()),
-('session_config.handlers', 'Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler', 0, 0, NOW(), NOW())
+('session_config.handlers', 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler', 0, 0, NOW(), NOW())
 ;
 
 

From 61fab3a62a8427590a9a9e99783ef6da435ce1a5 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Thu, 19 Sep 2013 15:11:54 +0200
Subject: [PATCH 11/51] order creation

---
 core/lib/Thelia/Action/Order.php              | 169 +++++++++++++++++-
 core/lib/Thelia/Cart/CartTrait.php            |   2 +
 core/lib/Thelia/Config/Resources/config.xml   |   1 +
 .../Thelia/Config/Resources/routing/front.xml |  14 +-
 .../Controller/Front/BaseFrontController.php  |   8 +-
 .../Controller/Front/DeliveryController.php   |  55 ------
 .../Controller/Front/OrderController.php      |  41 +++--
 core/lib/Thelia/Core/Event/OrderEvent.php     |  19 +-
 core/lib/Thelia/Core/Event/TheliaEvents.php   |   5 +-
 .../Core/Template/Element/BaseI18nLoop.php    |   2 +
 .../Core/Template/Loop/Argument/Argument.php  |  14 +-
 core/lib/Thelia/Core/Template/Loop/Cart.php   |   9 +
 .../Smarty/Plugins/DataAccessFunctions.php    |  21 ++-
 core/lib/Thelia/Model/Base/Order.php          |  12 +-
 .../Thelia/Model/Map/OrderStatusTableMap.php  |   2 +-
 core/lib/Thelia/Model/Map/OrderTableMap.php   |   2 +-
 core/lib/Thelia/Model/Order.php               |  13 ++
 core/lib/Thelia/Model/OrderStatus.php         |   9 +-
 core/lib/Thelia/Module/BaseModule.php         |   4 +-
 install/insert.sql                            |  19 ++
 install/thelia.sql                            |   7 +-
 local/config/schema.xml                       |   7 +-
 templates/default/order_invoice.html          |  13 +-
 templates/default/order_payment.html          |  60 +++++++
 24 files changed, 410 insertions(+), 98 deletions(-)
 delete mode 100644 core/lib/Thelia/Controller/Front/DeliveryController.php
 create mode 100644 templates/default/order_payment.html

diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php
index 15266fac1..bb1e0b4ec 100755
--- a/core/lib/Thelia/Action/Order.php
+++ b/core/lib/Thelia/Action/Order.php
@@ -23,15 +23,16 @@
 
 namespace Thelia\Action;
 
+use Propel\Runtime\Exception\PropelException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Thelia\Core\Event\CartEvent;
 use Thelia\Core\Event\OrderEvent;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Model\ProductPrice;
-use Thelia\Model\ProductPriceQuery;
-use Thelia\Model\CartItem;
-use Thelia\Model\CartItemQuery;
+use Thelia\Model\Base\AddressQuery;
+use Thelia\Model\OrderStatus;
+use Thelia\Model\Map\OrderTableMap;
+use Thelia\Model\OrderAddress;
+use Thelia\Model\OrderStatusQuery;
 use Thelia\Model\ConfigQuery;
 
 /**
@@ -67,6 +68,130 @@ class Order extends BaseAction implements EventSubscriberInterface
         $event->setOrder($order);
     }
 
+    /**
+     * @param \Thelia\Core\Event\OrderEvent $event
+     */
+    public function setInvoiceAddress(OrderEvent $event)
+    {
+        $order = $event->getOrder();
+
+        $order->chosenInvoiceAddress = $event->getInvoiceAddress();
+
+        $event->setOrder($order);
+    }
+
+    /**
+     * @param \Thelia\Core\Event\OrderEvent $event
+     */
+    public function setPaymentModule(OrderEvent $event)
+    {
+        $order = $event->getOrder();
+
+        $order->setPaymentModuleId($event->getPaymentModule());
+
+        $event->setOrder($order);
+    }
+
+    /**
+     * @param \Thelia\Core\Event\OrderEvent $event
+     */
+    public function create(OrderEvent $event)
+    {
+        $con = \Propel\Runtime\Propel::getConnection(
+            OrderTableMap::DATABASE_NAME
+        );
+
+        $con->beginTransaction();
+
+        $sessionOrder = $event->getOrder();
+
+        /* use a copy to avoid errored reccord in session */
+        $placedOrder = $sessionOrder->copy();
+
+        $customer = $this->getSecurityContext()->getCustomerUser();
+        $currency = $this->getSession()->getCurrency();
+        $lang = $this->getSession()->getLang();
+        $deliveryAddress = AddressQuery::create()->findPk($sessionOrder->chosenDeliveryAddress);
+        $invoiceAddress = AddressQuery::create()->findPk($sessionOrder->chosenInvoiceAddress);
+
+        /* fulfill order */
+        $placedOrder->setCustomerId($customer->getId());
+        $placedOrder->setCurrencyId($currency->getId());
+        $placedOrder->setCurrencyRate($currency->getRate());
+        $placedOrder->setLangId($lang->getId());
+
+        /* hard save the delivery and invoice addresses */
+        $deliveryOrderAddress = new OrderAddress();
+        $deliveryOrderAddress
+            ->setCustomerTitleId($deliveryAddress->getTitleId())
+            ->setCompany($deliveryAddress->getCompany())
+            ->setFirstname($deliveryAddress->getFirstname())
+            ->setLastname($deliveryAddress->getLastname())
+            ->setAddress1($deliveryAddress->getAddress1())
+            ->setAddress2($deliveryAddress->getAddress2())
+            ->setAddress3($deliveryAddress->getAddress3())
+            ->setZipcode($deliveryAddress->getZipcode())
+            ->setCity($deliveryAddress->getCity())
+            ->setCountryId($deliveryAddress->getCountryId())
+            ->save($con)
+        ;
+
+        $invoiceOrderAddress = new OrderAddress();
+        $invoiceOrderAddress
+            ->setCustomerTitleId($invoiceAddress->getTitleId())
+            ->setCompany($invoiceAddress->getCompany())
+            ->setFirstname($invoiceAddress->getFirstname())
+            ->setLastname($invoiceAddress->getLastname())
+            ->setAddress1($invoiceAddress->getAddress1())
+            ->setAddress2($invoiceAddress->getAddress2())
+            ->setAddress3($invoiceAddress->getAddress3())
+            ->setZipcode($invoiceAddress->getZipcode())
+            ->setCity($invoiceAddress->getCity())
+            ->setCountryId($invoiceAddress->getCountryId())
+            ->save($con)
+        ;
+
+        $placedOrder->setDeliveryOrderAddressId($deliveryOrderAddress->getId());
+        $placedOrder->setInvoiceOrderAddressId($invoiceOrderAddress->getId());
+
+        $placedOrder->setStatusId(
+            OrderStatusQuery::create()->findOneByCode(OrderStatus::CODE_NOT_PAID)->getId()
+        );
+
+        $placedOrder->save($con);
+
+        /* fulfill order_products and decrease stock // @todo dispatch event */
+
+        /* discount */
+
+        /* postage */
+
+
+        $con->commit();
+
+
+        /* dispatch mail event */
+
+        /* clear session ? */
+
+        /* call pay method */
+
+        $out = true;
+    }
+
+    /**
+     * @param \Thelia\Core\Event\OrderEvent $event
+     */
+    public function setReference(OrderEvent $event)
+    {
+        $this->setRef($this->generateRef());
+    }
+
+    public function generateRef()
+    {
+        return sprintf('O', uniqid('', true), $this->getId());
+    }
+
     /**
      * Returns an array of event names this subscriber wants to listen to.
      *
@@ -92,6 +217,40 @@ class Order extends BaseAction implements EventSubscriberInterface
         return array(
             TheliaEvents::ORDER_SET_DELIVERY_ADDRESS => array("setDeliveryAddress", 128),
             TheliaEvents::ORDER_SET_DELIVERY_MODULE => array("setDeliveryModule", 128),
+            TheliaEvents::ORDER_SET_INVOICE_ADDRESS => array("setInvoiceAddress", 128),
+            TheliaEvents::ORDER_SET_PAYMENT_MODULE => array("setPaymentModule", 128),
+            TheliaEvents::ORDER_PAY => array("create", 128),
+            TheliaEvents::ORDER_SET_REFERENCE => array("setReference", 128),
         );
     }
+
+    /**
+     * Return the security context
+     *
+     * @return SecurityContext
+     */
+    protected function getSecurityContext()
+    {
+        return $this->container->get('thelia.securityContext');
+    }
+
+    /**
+     * @return \Symfony\Component\HttpFoundation\Request
+     */
+    protected function getRequest()
+    {
+        return $this->container->get('request');
+    }
+
+    /**
+     * Returns the session from the current request
+     *
+     * @return \Thelia\Core\HttpFoundation\Session\Session
+     */
+    protected function getSession()
+    {
+        $request = $this->getRequest();
+
+        return $request->getSession();
+    }
 }
diff --git a/core/lib/Thelia/Cart/CartTrait.php b/core/lib/Thelia/Cart/CartTrait.php
index 8589f25b5..8ced1b6c1 100755
--- a/core/lib/Thelia/Cart/CartTrait.php
+++ b/core/lib/Thelia/Cart/CartTrait.php
@@ -139,4 +139,6 @@ trait CartTrait
         return $id;
 
     }
+
+    abstract public function getDispatcher();
 }
diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 6f8e838ed..9df11ba72 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -227,6 +227,7 @@
             <argument type="service" id="request" />
             <argument type="service" id="thelia.securityContext" />
             <argument type="service" id="thelia.parser.context"/>
+            <argument type="service" id="event_dispatcher"/>
         </service>
 
         <service id="smarty.plugin.adminUtilities" class="Thelia\Core\Template\Smarty\Plugins\AdminUtilities" scope="request">
diff --git a/core/lib/Thelia/Config/Resources/routing/front.xml b/core/lib/Thelia/Config/Resources/routing/front.xml
index c1e153af0..f254a817e 100755
--- a/core/lib/Thelia/Config/Resources/routing/front.xml
+++ b/core/lib/Thelia/Config/Resources/routing/front.xml
@@ -112,6 +112,9 @@
         <default key="_view">cart</default>
     </route>
 
+    <!-- end cart routes -->
+
+    <!-- order management process -->
     <route id="order.delivery.process" path="/order/delivery" methods="post">
         <default key="_controller">Thelia\Controller\Front\OrderController::deliver</default>
         <default key="_view">order_delivery</default>
@@ -123,7 +126,7 @@
     </route>
 
     <route id="order.invoice.process" path="/order/invoice" methods="post">
-        <default key="_controller">Thelia\Controller\Front\OrderController::pay</default>
+        <default key="_controller">Thelia\Controller\Front\OrderController::invoice</default>
         <default key="_view">order_invoice</default>
     </route>
 
@@ -132,12 +135,9 @@
         <default key="_view">order_invoice</default>
     </route>
 
-    <!-- end cart routes -->
-
-    <!-- order management process -->
-    <route id="order.delivery.add" path="/delivery/choose/{delivery_id}">
-        <default key="_controller">Thelia\Controller\Front\DeliveryController::select</default>
-        <requirement key="delivery_id">\d+</requirement>
+    <route id="order.payment.process" path="/order/pay">
+        <default key="_controller">Thelia\Controller\Front\OrderController::pay</default>
+        <default key="_view">order_payment</default>
     </route>
     <!-- end order management process -->
 
diff --git a/core/lib/Thelia/Controller/Front/BaseFrontController.php b/core/lib/Thelia/Controller/Front/BaseFrontController.php
index 74e918b2d..b8a7c6a98 100755
--- a/core/lib/Thelia/Controller/Front/BaseFrontController.php
+++ b/core/lib/Thelia/Controller/Front/BaseFrontController.php
@@ -72,7 +72,13 @@ class BaseFrontController extends BaseController
         if(null === $order || null === $order->chosenDeliveryAddress || null === $order->getDeliveryModuleId()) {
             $this->redirectToRoute("order.delivery");
         }
+    }
 
-
+    protected function checkValidInvoice()
+    {
+        $order = $this->getSession()->getOrder();
+        if(null === $order || null === $order->chosenInvoiceAddress || null === $order->getPaymentModuleId()) {
+            $this->redirectToRoute("order.invoice");
+        }
     }
 }
diff --git a/core/lib/Thelia/Controller/Front/DeliveryController.php b/core/lib/Thelia/Controller/Front/DeliveryController.php
deleted file mode 100644
index ef5913bc9..000000000
--- a/core/lib/Thelia/Controller/Front/DeliveryController.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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\Controller\Front;
-use Thelia\Model\ModuleQuery;
-use Thelia\Tools\URL;
-
-/**
- * Class DeliveryController
- * @package Thelia\Controller\Front
- * @author Manuel Raynaud <mraynaud@openstudio.fr>
- */
-class DeliveryController extends BaseFrontController
-{
-    public function select($delivery_id)
-    {
-        if ($this->getSecurityContext()->hasCustomerUser() === false) {
-            $this->redirect(URL::getInstance()->getIndexPage());
-        }
-
-        $request = $this->getRequest();
-
-        $deliveryModule = ModuleQuery::create()
-            ->filterById($delivery_id)
-            ->filterByActivate(1)
-            ->findOne()
-        ;
-
-        if ($deliveryModule) {
-            $request->getSession()->setDelivery($delivery_id);
-        } else {
-            $this->pageNotFound();
-        }
-    }
-}
diff --git a/core/lib/Thelia/Controller/Front/OrderController.php b/core/lib/Thelia/Controller/Front/OrderController.php
index 75fa91b36..53d1e070b 100755
--- a/core/lib/Thelia/Controller/Front/OrderController.php
+++ b/core/lib/Thelia/Controller/Front/OrderController.php
@@ -121,7 +121,7 @@ class OrderController extends BaseFrontController
      * set invoice address
      * set payment module
      */
-    public function pay()
+    public function invoice()
     {
         $this->checkAuth();
         $this->checkCartNotEmpty();
@@ -134,23 +134,23 @@ class OrderController extends BaseFrontController
         try {
             $form = $this->validateForm($orderPayment, "post");
 
-            $deliveryAddressId = $form->get("delivery-address")->getData();
-            $deliveryModuleId = $form->get("delivery-module")->getData();
+            $invoiceAddressId = $form->get("invoice-address")->getData();
+            $paymentModuleId = $form->get("payment-module")->getData();
 
             /* check that the invoice address belongs to the current customer */
-            $deliveryAddress = AddressQuery::create()->findPk($deliveryAddressId);
-            if($deliveryAddress->getCustomerId() !== $this->getSecurityContext()->getCustomerUser()->getId()) {
+            $invoiceAddress = AddressQuery::create()->findPk($invoiceAddressId);
+            if($invoiceAddress->getCustomerId() !== $this->getSecurityContext()->getCustomerUser()->getId()) {
                 throw new \Exception("Invoice address does not belong to the current customer");
             }
 
             $orderEvent = $this->getOrderEvent();
-            $orderEvent->setInvoiceAddress($deliveryAddressId);
-            $orderEvent->setPaymentModule($deliveryModuleId);
+            $orderEvent->setInvoiceAddress($invoiceAddressId);
+            $orderEvent->setPaymentModule($paymentModuleId);
 
-            $this->getDispatcher()->dispatch(TheliaEvents::ORDER_SET_DELIVERY_ADDRESS, $orderEvent);
-            $this->getDispatcher()->dispatch(TheliaEvents::ORDER_SET_DELIVERY_MODULE, $orderEvent);
+            $this->getDispatcher()->dispatch(TheliaEvents::ORDER_SET_INVOICE_ADDRESS, $orderEvent);
+            $this->getDispatcher()->dispatch(TheliaEvents::ORDER_SET_PAYMENT_MODULE, $orderEvent);
 
-            $this->redirectToRoute("order.invoice");
+            $this->redirectToRoute("order.payment.process");
 
         } catch (FormValidationException $e) {
             $message = sprintf("Please check your input: %s", $e->getMessage());
@@ -161,7 +161,7 @@ class OrderController extends BaseFrontController
         }
 
         if ($message !== false) {
-            Tlog::getInstance()->error(sprintf("Error during order delivery process : %s. Exception was %s", $message, $e->getMessage()));
+            Tlog::getInstance()->error(sprintf("Error during order payment process : %s. Exception was %s", $message, $e->getMessage()));
 
             $orderPayment->setErrorMessage($message);
 
@@ -173,6 +173,25 @@ class OrderController extends BaseFrontController
 
     }
 
+    public function pay()
+    {
+        /* check customer */
+        $this->checkAuth();
+
+        /* check cart count */
+        $this->checkCartNotEmpty();
+
+        /* check delivery address and module */
+        $this->checkValidDelivery();
+
+        /* check invoice address and payment module */
+        $this->checkValidInvoice();
+
+        $orderEvent = $this->getOrderEvent();
+
+        $this->getDispatcher()->dispatch(TheliaEvents::ORDER_PAY, $orderEvent);
+    }
+
     protected function getOrderEvent()
     {
         $order = $this->getOrder($this->getRequest());
diff --git a/core/lib/Thelia/Core/Event/OrderEvent.php b/core/lib/Thelia/Core/Event/OrderEvent.php
index 349fd53a1..a156b753f 100755
--- a/core/lib/Thelia/Core/Event/OrderEvent.php
+++ b/core/lib/Thelia/Core/Event/OrderEvent.php
@@ -33,6 +33,7 @@ class OrderEvent extends ActionEvent
     protected $deliveryModule = null;
     protected $paymentModule = null;
     protected $postage = null;
+    protected $ref = null;
 
     /**
      * @param Order $order
@@ -55,7 +56,7 @@ class OrderEvent extends ActionEvent
      */
     public function setInvoiceAddress($address)
     {
-        $this->deliveryAddress = $address;
+        $this->invoiceAddress = $address;
     }
 
     /**
@@ -90,6 +91,14 @@ class OrderEvent extends ActionEvent
         $this->postage = $postage;
     }
 
+    /**
+     * @param $ref
+     */
+    public function setRef($ref)
+    {
+        $this->ref = $ref;
+    }
+
     /**
      * @return null|Order
      */
@@ -137,4 +146,12 @@ class OrderEvent extends ActionEvent
     {
         return $this->postage;
     }
+
+    /**
+     * @return null|int
+     */
+    public function getRef()
+    {
+        return $this->ref;
+    }
 }
diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php
index 6a024f33b..3b049bfef 100755
--- a/core/lib/Thelia/Core/Event/TheliaEvents.php
+++ b/core/lib/Thelia/Core/Event/TheliaEvents.php
@@ -215,9 +215,12 @@ final class TheliaEvents
     /**
      * Order linked event
      */
-    const ORDER_SET_BILLING_ADDRESS = "action.order.setBillingAddress";
     const ORDER_SET_DELIVERY_ADDRESS = "action.order.setDeliveryAddress";
     const ORDER_SET_DELIVERY_MODULE = "action.order.setDeliveryModule";
+    const ORDER_SET_INVOICE_ADDRESS = "action.order.setInvoiceAddress";
+    const ORDER_SET_PAYMENT_MODULE = "action.order.setPaymentModule";
+    const ORDER_PAY = "action.order.pay";
+    const ORDER_SET_REFERENCE = "action.order.setReference";
 
     /**
      * Sent on image processing
diff --git a/core/lib/Thelia/Core/Template/Element/BaseI18nLoop.php b/core/lib/Thelia/Core/Template/Element/BaseI18nLoop.php
index 283aad797..557c64901 100644
--- a/core/lib/Thelia/Core/Template/Element/BaseI18nLoop.php
+++ b/core/lib/Thelia/Core/Template/Element/BaseI18nLoop.php
@@ -65,6 +65,8 @@ abstract class BaseI18nLoop extends BaseLoop
     {
         /* manage translations */
 
+        $fr = $this->getForce_return();
+
         return ModelCriteriaTools::getI18n(
             $this->getBackend_context(),
             $this->getLang(),
diff --git a/core/lib/Thelia/Core/Template/Loop/Argument/Argument.php b/core/lib/Thelia/Core/Template/Loop/Argument/Argument.php
index 54c2e3bf2..418a76220 100755
--- a/core/lib/Thelia/Core/Template/Loop/Argument/Argument.php
+++ b/core/lib/Thelia/Core/Template/Loop/Argument/Argument.php
@@ -58,7 +58,19 @@ class Argument
 
     public function setValue($value)
     {
-        $this->value = $value === null ? null : (string) $value;
+        $x = $value === null;
+
+        if($value === null) {
+            $this->value = null;
+        } else {
+            if(false === $value) {
+                /* (string) $value = "" */
+                $this->value = 0;
+            } else {
+                $this->value = (string) $value;
+            }
+        }
+        //$this->value = $value === null ? null : (string) $value;
     }
 
     public static function createAnyTypeArgument($name, $default=null, $mandatory=false, $empty=true)
diff --git a/core/lib/Thelia/Core/Template/Loop/Cart.php b/core/lib/Thelia/Core/Template/Loop/Cart.php
index 3c8724d68..16c108135 100755
--- a/core/lib/Thelia/Core/Template/Loop/Cart.php
+++ b/core/lib/Thelia/Core/Template/Loop/Cart.php
@@ -110,4 +110,13 @@ class Cart extends BaseLoop
         return $result;
     }
 
+    /**
+     * Return the event dispatcher,
+     *
+     * @return \Symfony\Component\EventDispatcher\EventDispatcher
+     */
+    public function getDispatcher()
+    {
+        return $this->dispatcher;
+    }
 }
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php
index ffad52785..fe203e7b8 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php
@@ -24,6 +24,7 @@
 namespace Thelia\Core\Template\Smarty\Plugins;
 
 use Propel\Runtime\ActiveQuery\ModelCriteria;
+use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
 use Symfony\Component\HttpFoundation\Request;
 use Thelia\Core\Template\Smarty\AbstractSmartyPlugin;
 use Thelia\Core\Security\SecurityContext;
@@ -53,12 +54,14 @@ class DataAccessFunctions extends AbstractSmartyPlugin
     private $securityContext;
     protected $parserContext;
     protected $request;
+    protected $dispatcher;
 
-    public function __construct(Request $request, SecurityContext $securityContext, ParserContext $parserContext)
+    public function __construct(Request $request, SecurityContext $securityContext, ParserContext $parserContext, ContainerAwareEventDispatcher $dispatcher)
     {
         $this->securityContext = $securityContext;
         $this->parserContext = $parserContext;
         $this->request = $request;
+        $this->dispatcher = $dispatcher;
     }
 
     /**
@@ -195,6 +198,12 @@ class DataAccessFunctions extends AbstractSmartyPlugin
                 return $order->getPostage();
             case 'delivery_address':
                 return $order->chosenDeliveryAddress;
+            case 'invoice_address':
+                return $order->chosenInvoiceAddress;
+            case 'delivery_module':
+                return $order->getDeliveryModuleId();
+            case 'payment_module':
+                return $order->getPaymentModuleId();
         }
 
         throw new \InvalidArgumentException(sprintf("%s has no '%s' attribute", 'Order', $attribute));
@@ -320,4 +329,14 @@ class DataAccessFunctions extends AbstractSmartyPlugin
             new SmartyPluginDescriptor('function', 'order', $this, 'orderDataAccess'),
         );
     }
+
+    /**
+     * Return the event dispatcher,
+     *
+     * @return \Symfony\Component\EventDispatcher\EventDispatcher
+     */
+    public function getDispatcher()
+    {
+        return $this->dispatcher;
+    }
 }
diff --git a/core/lib/Thelia/Model/Base/Order.php b/core/lib/Thelia/Model/Base/Order.php
index a2cd3f829..582ec6e23 100644
--- a/core/lib/Thelia/Model/Base/Order.php
+++ b/core/lib/Thelia/Model/Base/Order.php
@@ -1653,8 +1653,18 @@ abstract class Order implements ActiveRecordInterface
             $modifiedColumns[':p' . $index++]  = 'UPDATED_AT';
         }
 
+        $db = Propel::getServiceContainer()->getAdapter(OrderTableMap::DATABASE_NAME);
+        $dbMap = Propel::getServiceContainer()->getDatabaseMap(OrderTableMap::DATABASE_NAME);
+
+        $tableName = OrderTableMap::TABLE_NAME;
+
+        if ($db->useQuoteIdentifier()) {
+            $tableName = $db->quoteIdentifierTable($tableName);
+        }
+
         $sql = sprintf(
-            'INSERT INTO order (%s) VALUES (%s)',
+            'INSERT INTO %s (%s) VALUES (%s)',
+            $tableName,
             implode(', ', $modifiedColumns),
             implode(', ', array_keys($modifiedColumns))
         );
diff --git a/core/lib/Thelia/Model/Map/OrderStatusTableMap.php b/core/lib/Thelia/Model/Map/OrderStatusTableMap.php
index bc283a3e8..f29ed9464 100644
--- a/core/lib/Thelia/Model/Map/OrderStatusTableMap.php
+++ b/core/lib/Thelia/Model/Map/OrderStatusTableMap.php
@@ -150,7 +150,7 @@ class OrderStatusTableMap extends TableMap
         $this->setUseIdGenerator(true);
         // columns
         $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
-        $this->addColumn('CODE', 'Code', 'VARCHAR', false, 45, null);
+        $this->addColumn('CODE', 'Code', 'VARCHAR', true, 45, null);
         $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
         $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
     } // initialize()
diff --git a/core/lib/Thelia/Model/Map/OrderTableMap.php b/core/lib/Thelia/Model/Map/OrderTableMap.php
index ae43bd768..7daabb665 100644
--- a/core/lib/Thelia/Model/Map/OrderTableMap.php
+++ b/core/lib/Thelia/Model/Map/OrderTableMap.php
@@ -215,7 +215,7 @@ class OrderTableMap extends TableMap
         $this->addForeignKey('CUSTOMER_ID', 'CustomerId', 'INTEGER', 'customer', 'ID', true, null, null);
         $this->addForeignKey('INVOICE_ORDER_ADDRESS_ID', 'InvoiceOrderAddressId', 'INTEGER', 'order_address', 'ID', true, null, null);
         $this->addForeignKey('DELIVERY_ORDER_ADDRESS_ID', 'DeliveryOrderAddressId', 'INTEGER', 'order_address', 'ID', true, null, null);
-        $this->addColumn('INVOICE_DATE', 'InvoiceDate', 'DATE', true, null, null);
+        $this->addColumn('INVOICE_DATE', 'InvoiceDate', 'DATE', false, null, null);
         $this->addForeignKey('CURRENCY_ID', 'CurrencyId', 'INTEGER', 'currency', 'ID', true, null, null);
         $this->addColumn('CURRENCY_RATE', 'CurrencyRate', 'FLOAT', true, null, null);
         $this->addColumn('TRANSACTION_REF', 'TransactionRef', 'VARCHAR', false, 100, null);
diff --git a/core/lib/Thelia/Model/Order.php b/core/lib/Thelia/Model/Order.php
index e2eb43971..0ba2a7185 100755
--- a/core/lib/Thelia/Model/Order.php
+++ b/core/lib/Thelia/Model/Order.php
@@ -2,13 +2,26 @@
 
 namespace Thelia\Model;
 
+use Propel\Runtime\Connection\ConnectionInterface;
+use Thelia\Core\Event\OrderEvent;
+use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Base\Order as BaseOrder;
 
 class Order extends BaseOrder
 {
+    use \Thelia\Model\Tools\ModelEventDispatcherTrait;
+
     public $chosenDeliveryAddress = null;
     public $chosenInvoiceAddress = null;
 
+    /**
+     * {@inheritDoc}
+     */
+    /*public function postInsert(ConnectionInterface $con = null)
+    {
+        $this->dispatchEvent(TheliaEvents::ORDER_SET_REFERENCE, new OrderEvent($this));
+    }*/
+
     /**
      * calculate the total amount
      *
diff --git a/core/lib/Thelia/Model/OrderStatus.php b/core/lib/Thelia/Model/OrderStatus.php
index 2927019d0..f78e9c79d 100755
--- a/core/lib/Thelia/Model/OrderStatus.php
+++ b/core/lib/Thelia/Model/OrderStatus.php
@@ -4,6 +4,11 @@ namespace Thelia\Model;
 
 use Thelia\Model\Base\OrderStatus as BaseOrderStatus;
 
-class OrderStatus extends BaseOrderStatus {
-
+class OrderStatus extends BaseOrderStatus
+{
+    const CODE_NOT_PAID = "not_paid";
+    const CODE_PAID = "paid";
+    const CODE_PROCESSED = "processed";
+    const CODE_SENT = "sent";
+    const CODE_CANCELED = "canceled";
 }
diff --git a/core/lib/Thelia/Module/BaseModule.php b/core/lib/Thelia/Module/BaseModule.php
index 56b2c23af..f559c1fd5 100755
--- a/core/lib/Thelia/Module/BaseModule.php
+++ b/core/lib/Thelia/Module/BaseModule.php
@@ -105,7 +105,7 @@ abstract class BaseModule extends ContainerAware
                     $image = new ModuleImage();
                     $image->setModuleId($module->getId());
                     $image->setPosition($imagePosition);
-                    $image->save();
+                    $image->save($con);
 
                     $imageDirectory = sprintf("%s/../../../../local/media/images/module", __DIR__);
                     $imageFileName = sprintf("%s-%d-%s", $module->getCode(), $image->getId(), $fileName);
@@ -131,7 +131,7 @@ abstract class BaseModule extends ContainerAware
                     }
 
                     $image->setFile($imageFileName);
-                    $image->save();
+                    $image->save($con);
 
                     $con->commit();
                     $imagePosition++;
diff --git a/install/insert.sql b/install/insert.sql
index b6eb12dd8..2da333a6d 100755
--- a/install/insert.sql
+++ b/install/insert.sql
@@ -1167,3 +1167,22 @@ INSERT INTO `tax_rule_i18n` (`id`, `locale`, `title`)
 INSERT INTO  `tax_rule_country` (`tax_rule_id`, `country_id`, `tax_id`, `position`, `created_at`, `updated_at`)
   VALUES
   (1, 64, 1, 1, NOW(), NOW());
+
+INSERT INTO `order_status`(`id`, `code`, `created_at`, `updated_at`) VALUES
+(1, 'not_paid', NOW(), NOW()),
+(2, 'paid', NOW(), NOW()),
+(3, 'processing', NOW(), NOW()),
+(4, 'sent', NOW(), NOW()),
+(5, 'canceled', NOW(), NOW());
+
+INSERT INTO `order_status_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES
+(1, 'en_US', 'Not paid', '', '', ''),
+(1, 'fr_FR', 'Non payée', '', '', ''),
+(2, 'en_US', 'Paid', '', '', ''),
+(2, 'fr_FR', 'Payée', '', '', ''),
+(3, 'en_US', 'Processing', '', '', ''),
+(3, 'fr_FR', 'Traitement', '', '', ''),
+(4, 'en_US', 'Sent', '', '', ''),
+(4, 'fr_FR', 'Envoyée', '', '', ''),
+(5, 'en_US', 'Canceled', '', '', ''),
+(5, 'fr_FR', 'Annulée', '', '', '');
diff --git a/install/thelia.sql b/install/thelia.sql
index 398cb04c2..bd983d26d 100755
--- a/install/thelia.sql
+++ b/install/thelia.sql
@@ -641,7 +641,7 @@ CREATE TABLE `order`
     `customer_id` INTEGER NOT NULL,
     `invoice_order_address_id` INTEGER NOT NULL,
     `delivery_order_address_id` INTEGER NOT NULL,
-    `invoice_date` DATE NOT NULL,
+    `invoice_date` DATE,
     `currency_id` INTEGER NOT NULL,
     `currency_rate` FLOAT NOT NULL,
     `transaction_ref` VARCHAR(100) COMMENT 'transaction reference - usually use to identify a transaction with banking modules',
@@ -788,10 +788,11 @@ DROP TABLE IF EXISTS `order_status`;
 CREATE TABLE `order_status`
 (
     `id` INTEGER NOT NULL AUTO_INCREMENT,
-    `code` VARCHAR(45),
+    `code` VARCHAR(45) NOT NULL,
     `created_at` DATETIME,
     `updated_at` DATETIME,
-    PRIMARY KEY (`id`)
+    PRIMARY KEY (`id`),
+    UNIQUE INDEX `code_UNIQUE` (`code`)
 ) ENGINE=InnoDB;
 
 -- ---------------------------------------------------------------------
diff --git a/local/config/schema.xml b/local/config/schema.xml
index f33cedbe5..b767580ef 100755
--- a/local/config/schema.xml
+++ b/local/config/schema.xml
@@ -500,7 +500,7 @@
     <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="invoice_date" 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" />
@@ -613,11 +613,14 @@
   </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="code" required="true" 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" />
+    <unique name="code_UNIQUE">
+      <unique-column name="code" />
+    </unique>
     <behavior name="timestampable" />
     <behavior name="i18n">
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
diff --git a/templates/default/order_invoice.html b/templates/default/order_invoice.html
index 5fc55c0df..6a5b493a4 100644
--- a/templates/default/order_invoice.html
+++ b/templates/default/order_invoice.html
@@ -262,17 +262,24 @@
 
                 <div id="payment-method" class="panel">
                     <div class="panel-heading">Choose your payment method</div>
+
+                    {if $error}
+                        <span class="help-block"><span class="icon-remove"></span> {$message}</span>
+                    {/if}
+
                     <div class="panel-body">
                         <ul class="list-payment">
 
                             {loop type="payment" name="payments" force_return="true"}
 
+                                {assign "paymentModuleId" $ID}
+
                                 {loop type="image" name="paymentspicture" source="module" source_id=$ID force_return="true" width="100" height="72"}
 
                                     <li>
                                         <div class="radio">
-                                            <label for="payment_{$ID}">
-                                                <input type="radio" name="payment" id="payment_{$ID}" value="test">
+                                            <label for="payment_{$paymentModuleId}_{$ID}">
+                                                <input type="radio" name="{$name}" id="payment_{$paymentModuleId}_{$ID}" value="{$paymentModuleId}">
                                                 <img src="{$IMAGE_URL}">
                                             </label>
                                         </div>
@@ -288,7 +295,7 @@
                 {/form_field}
 
                 <a href="{url path="/order/delivery"}" role="button" class="btn btn-back"><span>Back</span></a>
-                <button type="submit" class="btn btn-checkout-next"><span>TO REMOVE</span></button>
+                <button type="submit" class="btn btn-checkout-next"><span>Next Step</span></button>
             </form>
 
             {/form}
diff --git a/templates/default/order_payment.html b/templates/default/order_payment.html
new file mode 100644
index 000000000..884230258
--- /dev/null
+++ b/templates/default/order_payment.html
@@ -0,0 +1,60 @@
+{extends file="layout.tpl"}
+
+{block name="breadcrumb"}
+    <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
+        <strong id="breadcrumb-label">You are here: </strong>
+        <ul class="breadcrumb" itemprop="breadcrumb">
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">Home</span></a></li>
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{url path="/cart"}" itemprop="url"><span itemprop="title">Cart</span></a></li>
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">Secure Payment</span></li>
+        </ul>
+    </nav><!-- /.nav-breadcrumb -->
+{/block}
+
+{block name="main-content"}
+    <div class="main">
+        <article class="col-main clearfix" role="main" aria-labelledby="main-label">
+
+            <h1 id="main-label" class="page-header">Your Cart</h1>
+
+            <div class="btn-group checkout-progress">
+                <a href="cart.php" role="button" class="btn btn-step disabled"><span class="step-nb">1</span> <span class="step-label">Your Cart</span></a>
+                <a href="cart-step2.php" role="button" class="btn btn-step disabled"><span class="step-nb">2</span> <span class="step-label">Billing and delivery</span></a>
+                <a href="cart-step3.php" role="button" class="btn btn-step disabled"><span class="step-nb">3</span> <span class="step-label">Check my order</span></a>
+                <a href="cart-step4.php" role="button" class="btn btn-step active"><span class="step-nb">4</span> <span class="step-label">Secure payment</span></a>
+            </div>
+
+            <div id="payment-success" class="panel">
+                <div class="panel-heading">
+                    <h3 class="panel-title">You chose to pay by : <span class="payment-method">Cheque</span></h3>
+                </div>
+                <div class="panel-body">
+                    <h3>Thank you for the trust you place in us.</h3>
+                    <p>A summary of your order email has been sent to the following address: email@toto.com</p>
+                    <p>Your order will be confirmed by us upon receipt of your payment.</p>
+
+                    <dl class="dl-horizontal">
+                        <dt>Order number : </dt>
+                        <dd>PRO123456788978979</dd>
+                        <dt>Date : </dt>
+                        <dd>02/12/2013</dd>
+                        <dt>Total : </dt>
+                        <dd>$216.25</dd>
+                    </dl>
+                </div>
+            </div>
+
+            <a href="{navigate to="index"}" role="button" class="btn btn-checkout-home"><span>Go home</span></a>
+
+        </article>
+
+    </div>
+{/block}
+
+{block name="javascript-initialization"}
+<script type="text/javascript">
+jQuery(function($order) {
+
+});
+</script>
+{/block}
\ No newline at end of file

From 41bd8a7cec6ec21577c5fc04f95948be71aee2c1 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Thu, 19 Sep 2013 15:39:36 +0200
Subject: [PATCH 12/51] icomplete product page

---
 .../lib/Thelia/Core/Template/Loop/Feature.php | 28 ++++++++++++++++---
 install/insert.sql                            |  2 +-
 templates/default/product.html                | 16 ++++++++---
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Loop/Feature.php b/core/lib/Thelia/Core/Template/Loop/Feature.php
index f5c66d2e6..380333e38 100755
--- a/core/lib/Thelia/Core/Template/Loop/Feature.php
+++ b/core/lib/Thelia/Core/Template/Loop/Feature.php
@@ -31,10 +31,12 @@ use Thelia\Core\Template\Element\LoopResultRow;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
-use Thelia\Model\Base\CategoryQuery;
-use Thelia\Model\Base\ProductCategoryQuery;
-use Thelia\Model\Base\FeatureQuery;
+use Thelia\Model\CategoryQuery;
+use Thelia\Model\FeatureI18nQuery;
+use Thelia\Model\ProductCategoryQuery;
+use Thelia\Model\FeatureQuery;
 use Thelia\Model\Map\ProductCategoryTableMap;
+use Thelia\Model\ProductQuery;
 use Thelia\Type\TypeCollection;
 use Thelia\Type;
 use Thelia\Type\BooleanOrBothType;
@@ -71,7 +73,8 @@ class Feature extends BaseI18nLoop
                     new Type\EnumListType(array('alpha', 'alpha-reverse', 'manual', 'manual_reverse'))
                 ),
                 'manual'
-            )
+            ),
+            Argument::createAnyTypeArgument('title')
         );
     }
 
@@ -134,6 +137,23 @@ class Feature extends BaseI18nLoop
             );
         }
 
+        $title = $this->getTitle();
+
+        if (null !== $title) {
+            //find all feture that match exactly this title and find with all locales.
+            $features = FeatureI18nQuery::create()
+                ->filterByTitle($title, Criteria::LIKE)
+                ->select('id')
+                ->find();
+
+            if($features) {
+                $search->filterById(
+                    $features,
+                    Criteria::IN
+                );
+            }
+        }
+
         $orders  = $this->getOrder();
 
         foreach ($orders as $order) {
diff --git a/install/insert.sql b/install/insert.sql
index b6eb12dd8..f44374d4b 100755
--- a/install/insert.sql
+++ b/install/insert.sql
@@ -27,7 +27,7 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
 ('thelia_admin_remember_me_cookie_expiration', 2592000, 0, 0, NOW(), NOW()),
 ('thelia_customer_remember_me_cookie_name', 'tcrmcn', 0, 0, NOW(), NOW()),
 ('thelia_customer_remember_me_cookie_expiration', 31536000, 0, 0, NOW(), NOW()),
-('session_config.handlers', 'Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler', 0, 0, NOW(), NOW())
+('session_config.handlers', 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler', 0, 0, NOW(), NOW())
 ;
 
 
diff --git a/templates/default/product.html b/templates/default/product.html
index 2a7e81bc4..f5224a9d2 100644
--- a/templates/default/product.html
+++ b/templates/default/product.html
@@ -18,8 +18,16 @@
         <article id="product" class="col-main" role="main" itemscope itemtype="http://schema.org/Product">
 
             <!-- Use the meta tag to specify content that is not visible on the page in any way -->
-            <meta itemprop="brand" content="Diesel">
-            <meta itemprop="productID" content="isbn:925872">
+            {loop name="brand.feature" type="feature" product="{$ID}" title="brand"}
+                {loop name="brand.value" type="feature_value" feature="{$ID}" product="{product attr="id"}"}
+                    <meta itemprop="brand" content="{$TITLE}">
+                {/loop}
+            {/loop}
+
+            <!--
+                activate this meta tag if you have isbn feature for exemple
+                <meta itemprop="productID" content="isbn:925872">
+            -->
 
             <section id="product-gallery">
                 <figure class="product-image">
@@ -84,7 +92,7 @@
                     <div class="price-container">
                         <meta itemprop="category" content="Category1">
                         <meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition"> <!-- List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition -->
-                        <meta itemprop="priceCurrency" content="USD"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
+                        <meta itemprop="priceCurrency" content="{currency attr="symbol"}"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
                         <link itemprop="availability" href="http://schema.org/InStock" content="in_stock" />
                         <!-- List of availibility :
                             out_of_stock : http://schema.org/OutOfStock
@@ -100,7 +108,7 @@
                             <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number="{$TAXED_PRICE}"} {currency attr="symbol"}</span></span>
                         {/loop}
                         {else}
-                            <span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number="{$TAXED_PRICE}"} {currency attr="symbol"}</span></span>
+                            <span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"}</span></span>
                         {/if}
                     </div>
                 </div>

From 65558e74e388a3f671ba12106f035efc0a50b981 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Thu, 19 Sep 2013 15:50:47 +0200
Subject: [PATCH 13/51] clean code in test suites

---
 core/lib/Thelia/Tests/Command/ModuleActivateCommandTest.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/lib/Thelia/Tests/Command/ModuleActivateCommandTest.php b/core/lib/Thelia/Tests/Command/ModuleActivateCommandTest.php
index e488e60ff..1d6d08e92 100755
--- a/core/lib/Thelia/Tests/Command/ModuleActivateCommandTest.php
+++ b/core/lib/Thelia/Tests/Command/ModuleActivateCommandTest.php
@@ -68,14 +68,11 @@ class ModuleActivateCommandTest extends \PHPUnit_Framework_TestCase
      */
     public function testModuleActivateCommandUnknownModule()
     {
-        $module = ModuleQuery::create()->findOne();
         $testedModule = ModuleQuery::create()->findOneByCode('Letshopethismoduledoesnotexists');
 
-        if(null !== $module && null == $testedModule) {
+        if(null == $testedModule) {
             $application = new Application($this->getKernel());
 
-            $module->setActivate(BaseModule::IS_NOT_ACTIVATED);
-            $module->save();
 
             $moduleActivate = new ModuleActivateCommand();
             $moduleActivate->setContainer($this->getContainer());

From ec7d4471dc513a810a6ec0c933122a1f821e93a8 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Thu, 19 Sep 2013 15:59:16 +0200
Subject: [PATCH 14/51] payment process

---
 core/lib/Thelia/Action/Order.php       | 20 +++++++++++++-------
 core/lib/Thelia/Form/OrderDelivery.php |  7 +++++++
 core/lib/Thelia/Form/OrderPayment.php  |  9 ++++++++-
 core/lib/Thelia/Model/Order.php        |  6 ++++--
 local/modules/Cheque/Cheque.php        |  2 +-
 5 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php
index bb1e0b4ec..4a982673a 100755
--- a/core/lib/Thelia/Action/Order.php
+++ b/core/lib/Thelia/Action/Order.php
@@ -29,6 +29,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Thelia\Core\Event\OrderEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Base\AddressQuery;
+use Thelia\Model\ModuleQuery;
 use Thelia\Model\OrderStatus;
 use Thelia\Model\Map\OrderTableMap;
 use Thelia\Model\OrderAddress;
@@ -114,6 +115,8 @@ class Order extends BaseAction implements EventSubscriberInterface
         $deliveryAddress = AddressQuery::create()->findPk($sessionOrder->chosenDeliveryAddress);
         $invoiceAddress = AddressQuery::create()->findPk($sessionOrder->chosenInvoiceAddress);
 
+        $paymentModule = ModuleQuery::findPk($placedOrder->getPaymentModuleId());
+
         /* fulfill order */
         $placedOrder->setCustomerId($customer->getId());
         $placedOrder->setCurrencyId($currency->getId());
@@ -162,21 +165,22 @@ class Order extends BaseAction implements EventSubscriberInterface
 
         /* fulfill order_products and decrease stock // @todo dispatch event */
 
-        /* discount */
-
-        /* postage */
-
+        /* discount @todo */
 
         $con->commit();
 
-
-        /* dispatch mail event */
+        /* T1style : dispatch mail event ? */
 
         /* clear session ? */
 
         /* call pay method */
+        $paymentModuleReflection = new \ReflectionClass($paymentModule->getFullNamespace());
+        $paymentModuleInstance = $paymentModuleReflection->newInstance();
 
-        $out = true;
+        $paymentModuleInstance->setRequest($this->request);
+        $paymentModuleInstance->setDispatcher($this->dispatcher);
+
+        $paymentModuleInstance->pay();
     }
 
     /**
@@ -184,6 +188,8 @@ class Order extends BaseAction implements EventSubscriberInterface
      */
     public function setReference(OrderEvent $event)
     {
+        $x = true;
+
         $this->setRef($this->generateRef());
     }
 
diff --git a/core/lib/Thelia/Form/OrderDelivery.php b/core/lib/Thelia/Form/OrderDelivery.php
index 3ef1444f6..e23ae92b2 100755
--- a/core/lib/Thelia/Form/OrderDelivery.php
+++ b/core/lib/Thelia/Form/OrderDelivery.php
@@ -85,6 +85,13 @@ class OrderDelivery extends BaseForm
         if(null === $module) {
             $context->addViolation("Delivery module ID not found");
         }
+
+        $moduleReflection = new \ReflectionClass($module->getFullNamespace());
+        if ($moduleReflection->isSubclassOf("Thelia\Module\DeliveryModuleInterface") === false) {
+            $context->addViolation(
+                sprintf("delivery module %s is not a Thelia\Module\DeliveryModuleInterface", $module->getCode())
+            );
+        }
     }
 
     public function getName()
diff --git a/core/lib/Thelia/Form/OrderPayment.php b/core/lib/Thelia/Form/OrderPayment.php
index d3ebe4daf..6a6305971 100755
--- a/core/lib/Thelia/Form/OrderPayment.php
+++ b/core/lib/Thelia/Form/OrderPayment.php
@@ -80,11 +80,18 @@ class OrderPayment extends BaseForm
             ->filterByType(BaseModule::PAYMENT_MODULE_TYPE)
             ->filterByActivate(1)
             ->filterById($value)
-            ->find();
+            ->findOne();
 
         if(null === $module) {
             $context->addViolation("Payment module ID not found");
         }
+
+        $moduleReflection = new \ReflectionClass($module->getFullNamespace());
+        if ($moduleReflection->isSubclassOf("Thelia\Module\PaymentModuleInterface") === false) {
+            $context->addViolation(
+                sprintf("delivery module %s is not a Thelia\Module\PaymentModuleInterface", $module->getCode())
+            );
+        }
     }
 
     public function getName()
diff --git a/core/lib/Thelia/Model/Order.php b/core/lib/Thelia/Model/Order.php
index 0ba2a7185..c5d03b7e7 100755
--- a/core/lib/Thelia/Model/Order.php
+++ b/core/lib/Thelia/Model/Order.php
@@ -17,10 +17,12 @@ class Order extends BaseOrder
     /**
      * {@inheritDoc}
      */
-    /*public function postInsert(ConnectionInterface $con = null)
+    public function preInsert(ConnectionInterface $con = null)
     {
         $this->dispatchEvent(TheliaEvents::ORDER_SET_REFERENCE, new OrderEvent($this));
-    }*/
+
+        return true;
+    }
 
     /**
      * calculate the total amount
diff --git a/local/modules/Cheque/Cheque.php b/local/modules/Cheque/Cheque.php
index d6b462194..f4438db4e 100755
--- a/local/modules/Cheque/Cheque.php
+++ b/local/modules/Cheque/Cheque.php
@@ -56,7 +56,7 @@ class Cheque extends BaseModule implements PaymentModuleInterface
 
     public function pay()
     {
-        // TODO: Implement pay() method.
+        // no special process, waiting for the cheque.
     }
 
     public function install()

From 198bd9bec8adfa347394defdf32c23004fbb030f Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Thu, 19 Sep 2013 16:06:42 +0200
Subject: [PATCH 15/51] add abstract getDispatcher method to use CartTrai

---
 core/lib/Thelia/Coupon/CouponBaseAdapter.php | 10 ++++++++++
 core/lib/Thelia/Model/Base/Order.php         | 12 +-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/lib/Thelia/Coupon/CouponBaseAdapter.php b/core/lib/Thelia/Coupon/CouponBaseAdapter.php
index f9fae8651..046b4ac81 100644
--- a/core/lib/Thelia/Coupon/CouponBaseAdapter.php
+++ b/core/lib/Thelia/Coupon/CouponBaseAdapter.php
@@ -266,4 +266,14 @@ class CouponBaseAdapter implements CouponAdapterInterface
     {
         return $this->container->get('thelia.constraint.validator');
     }
+
+    /**
+     * Return the event dispatcher,
+     *
+     * @return \Symfony\Component\EventDispatcher\EventDispatcher
+     */
+    public function getDispatcher()
+    {
+        return $this->container->get('event_dispatcher');
+    }
 }
diff --git a/core/lib/Thelia/Model/Base/Order.php b/core/lib/Thelia/Model/Base/Order.php
index 582ec6e23..a2cd3f829 100644
--- a/core/lib/Thelia/Model/Base/Order.php
+++ b/core/lib/Thelia/Model/Base/Order.php
@@ -1653,18 +1653,8 @@ abstract class Order implements ActiveRecordInterface
             $modifiedColumns[':p' . $index++]  = 'UPDATED_AT';
         }
 
-        $db = Propel::getServiceContainer()->getAdapter(OrderTableMap::DATABASE_NAME);
-        $dbMap = Propel::getServiceContainer()->getDatabaseMap(OrderTableMap::DATABASE_NAME);
-
-        $tableName = OrderTableMap::TABLE_NAME;
-
-        if ($db->useQuoteIdentifier()) {
-            $tableName = $db->quoteIdentifierTable($tableName);
-        }
-
         $sql = sprintf(
-            'INSERT INTO %s (%s) VALUES (%s)',
-            $tableName,
+            'INSERT INTO order (%s) VALUES (%s)',
             implode(', ', $modifiedColumns),
             implode(', ', array_keys($modifiedColumns))
         );

From 3fd5e4f3ad5bbdf0dd28668125a96f7a82adb295 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Thu, 19 Sep 2013 16:07:45 +0200
Subject: [PATCH 16/51] Setting of modules index view

---
 templates/admin/default/modules.html | 272 +++++++++++++++++++++++++++
 1 file changed, 272 insertions(+)

diff --git a/templates/admin/default/modules.html b/templates/admin/default/modules.html
index e69de29bb..787e00a5b 100644
--- a/templates/admin/default/modules.html
+++ b/templates/admin/default/modules.html
@@ -0,0 +1,272 @@
+{extends file="admin-layout.tpl"}
+
+{block name="page-title"}{intl l='Modules'}{/block}
+
+{block name="check-permissions"}admin.modules.view{/block}
+
+{block name="main-content"}
+<div class="modules">
+
+    <div id="wrapper" class="container">
+        
+        <div class="clearfix">
+            <ul class="breadcrumb pull-left">
+                <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
+                <li><a href="{url path='/admin/modules'}">{intl l="Modules"}</a></li>
+            </ul>
+            {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.modules.install"}
+                <a class="btn btn-default btn-primary pull-right" title="{intl l='Install a new module'}" href="#install_dialog" data-toggle="modal">
+                    <span class="glyphicon glyphicon-import"></span> {intl l="Install a new module"}
+                </a>
+            {/loop}
+        </div>
+
+        {module_include location='modules_top'}
+
+        <div class="row">
+            <div class="col-md-12">
+                <div class="general-block-decorator">
+                    <table class="table table-striped table-condensed table-left-aligned">
+                        <caption class="clearfix">
+                           {intl l='Transport modules'}
+                        </caption>
+                        <thead>
+                            <tr>
+                               <th>{intl l="Name"}</th>
+                               <th>{intl l="Description"}</th>
+                               <th>{intl l="Enable/Disable"}</th>
+
+                               {module_include location='modules_table_header'}
+
+                               <th class="actions">{intl l="Actions"}</th>
+                            </tr>
+                        </thead>
+
+                        <tbody>
+                            <tr>
+                                <td><a href="">Tinymce</a></td>                                    
+                                <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid! Eius, pariatur accusantium odit quidem laboriosam.</td>                                    
+                                <td>
+                                    <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
+                                        <input type="checkbox" checked>
+                                    </div>
+                                </td>
+
+                                {module_include location='modules_table_row'}
+
+                                <td>
+                                    <div class="btn-group">
+                                        
+                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
+                                           <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
+                                        {/loop}
+
+                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
+                                           <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
+                                        {/loop}                                                                                                                
+
+                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
+                                           <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+                                        {/loop}
+                                    </div>
+                                </td>
+                            </tr>                                
+                            <tr>
+                                <td><a href="">So colissimo</a></td>                                    
+                                <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid</td>                                    
+                                <td>
+                                    <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
+                                        <input type="checkbox">
+                                    </div>
+                                </td>
+
+                                {module_include location='modules_table_row'}
+
+                                <td>
+                                    <div class="btn-group">
+                                        
+                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
+                                           <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
+                                        {/loop}
+
+                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
+                                           <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
+                                        {/loop}                                                                                                                
+
+                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
+                                           <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+                                        {/loop}
+                                    </div>
+                                </td>
+                            </tr>                                
+                            <tr>
+                                <td><a href="">Title meta</a></td>                                    
+                                <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid</td>                                    
+                                <td>
+                                    <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
+                                        <input type="checkbox">
+                                    </div>
+                                </td>
+
+                                {module_include location='modules_table_row'}
+
+                                <td>
+                                    <div class="btn-group">
+                                        
+                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
+                                           <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
+                                        {/loop}
+
+                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
+                                           <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
+                                        {/loop}                                                                                                                
+
+                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
+                                           <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+                                        {/loop}
+                                    </div>
+                                </td>
+                            </tr>                                
+                        </tbody>
+                    </table>
+                </div>                
+
+                <div class="general-block-decorator">
+                    <table class="table table-striped table-condensed table-left-aligned">
+                        <caption class="clearfix">
+                           {intl l='Delivery modules'}
+                        </caption>
+                        <thead>
+                            <tr>
+                               <th>{intl l="Name"}</th>
+                               <th>{intl l="Description"}</th>
+                               <th>{intl l="Enable/Disable"}</th>
+
+                               {module_include location='modules_table_header'}
+
+                               <th class="actions">{intl l="Actions"}</th>
+                            </tr>
+                        </thead>
+
+                        <tbody>
+                            <tr>
+                                <td><a href="">Tinymce</a></td>                                    
+                                <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid! Eius, pariatur accusantium odit quidem laboriosam.</td>                                    
+                                <td>
+                                    <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
+                                        <input type="checkbox" checked>
+                                    </div>
+                                </td>
+
+                                {module_include location='modules_table_row'}
+
+                                <td>
+                                    <div class="btn-group">
+                                        
+                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
+                                           <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
+                                        {/loop}
+
+                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
+                                           <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
+                                        {/loop}                                                                                                                
+
+                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
+                                           <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+                                        {/loop}
+                                    </div>
+                                </td>
+                            </tr>                                
+                            <tr>
+                                <td><a href="">So colissimo</a></td>                                    
+                                <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid</td>                                    
+                                <td>
+                                    <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
+                                        <input type="checkbox">
+                                    </div>
+                                </td>
+
+                                {module_include location='modules_table_row'}
+
+                                <td>
+                                    <div class="btn-group">
+                                        
+                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
+                                           <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
+                                        {/loop}
+
+                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
+                                           <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
+                                        {/loop}                                                                                                                
+
+                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
+                                           <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+                                        {/loop}
+                                    </div>
+                                </td>
+                            </tr>                                
+                            <tr>
+                                <td><a href="">Title meta</a></td>                                    
+                                <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid</td>                                    
+                                <td>
+                                    <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
+                                        <input type="checkbox">
+                                    </div>
+                                </td>
+
+                                {module_include location='modules_table_row'}
+
+                                <td>
+                                    <div class="btn-group">
+                                        
+                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
+                                           <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
+                                        {/loop}
+
+                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
+                                           <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
+                                        {/loop}                                                                                                                
+
+                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
+                                           <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+                                        {/loop}
+                                    </div>
+                                </td>
+                            </tr>                                
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+
+        {module_include location='modules_bottom'}
+
+    </div>
+</div>
+
+{* Delete module confirmation dialog *}
+
+{capture "delete_module_dialog"}
+    <input type="hidden" name="current_module_id" value="{$current_module_id}" />
+    <input type="hidden" name="module_id" id="delete_module_id" value"" />
+{/capture}
+
+{include
+    file = "includes/generic-confirm-dialog.html"
+
+    dialog_id       = "delete_module_dialog"
+    dialog_title    = {intl l="Delete a module"}
+    dialog_message  = {intl l="Do you really want to delete this module ?"}
+
+    form_action         = {url path='/admin/modules/delete'}
+    form_content        = {$smarty.capture.delete_module_dialog nofilter}
+}
+
+{/block}
+
+{block name="javascript-initialization"}
+
+    {javascripts file='assets/js/bootstrap-switch/bootstrap-switch.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
+{/block}
\ No newline at end of file

From e1c2f8da0a3a43cfd91419620efdedb9c8336b97 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Thu, 19 Sep 2013 16:10:14 +0200
Subject: [PATCH 17/51] Add link on ref to edit customer

---
 templates/admin/default/customers.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html
index d69ce970b..6a10b7801 100644
--- a/templates/admin/default/customers.html
+++ b/templates/admin/default/customers.html
@@ -65,7 +65,7 @@
                                 <tbody>
                                 {loop name="customer_list" type="customer" current="false" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}}
                                     <tr>
-                                        <td>{$REF}</td>
+                                        <td><a href="{url path="/admin/customer/update/{$ID}" }">{$REF}</a></td>
 
                                         <td>
                                             {$COMPANY}

From cb20f5e38b4e52516bddaa53c4d1705d5e0310d1 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Thu, 19 Sep 2013 16:33:34 +0200
Subject: [PATCH 18/51] add block more info in product template

---
 templates/default/product.html | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/templates/default/product.html b/templates/default/product.html
index f5224a9d2..8888ac606 100644
--- a/templates/default/product.html
+++ b/templates/default/product.html
@@ -193,7 +193,17 @@
                         <p>{$DESCRIPTION}</p>
                     </div>
                     <div class="tab-pane" id="additional" role="tabpanel" aria-labelledby="tab2">
-                        <p>Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.</p>
+                        {ifloop rel="feature_value_info"}
+                        <ul>
+                        {loop name="feature_info" type="feature" product="{$ID}"}
+                            <li> <strong>{$TITLE}</strong> :
+                            {loop name="feature_value_info" type="feature_value" feature="{$ID}" product="{product attr="id"}"}
+                                {$TITLE}
+                            {/loop}
+                            </li>
+                        {/loop}
+                        </ul>
+                        {/ifloop}
                     </div>
                 </div>
             </section>

From 1d90e8ba5418c584f95038a165dac6989a3b803d Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Thu, 19 Sep 2013 16:42:03 +0200
Subject: [PATCH 19/51] Responsive management header

---
 templates/admin/default/admin-layout.tpl      | 206 +++++++++---------
 .../default/assets/less/thelia/grid.less      |  11 +
 .../default/assets/less/thelia/navbar.less    |   4 +
 .../default/assets/less/thelia/thelia.less    |   1 +
 4 files changed, 120 insertions(+), 102 deletions(-)
 create mode 100644 templates/admin/default/assets/less/thelia/grid.less

diff --git a/templates/admin/default/admin-layout.tpl b/templates/admin/default/admin-layout.tpl
index 8221fa90a..b80d5d13c 100644
--- a/templates/admin/default/admin-layout.tpl
+++ b/templates/admin/default/admin-layout.tpl
@@ -51,27 +51,27 @@
 			<div class="container">
 
 		        <div class="row">
-		            <div class="col-md-6">
-		      		    <div class="version-info">{intl l='Version %ver' ver="{$THELIA_VERSION}"}</div>
+		            <div class="col-md-12 clearfix">
+		      		    <div class="version-info pull-left">{intl l='Version %ver' ver="{$THELIA_VERSION}"}</div>
+                        
+                        <div class="clearfix pull-right hidden-xs">
+                            <div class="btn-group pull-right">
+                                <a href="{navigate to="index"}" title="{intl l='View site'}" target="_blank" class="btn btn-default"><span class="glyphicon glyphicon-eye-open"></span> {intl l="View shop"}</a>
+                                <button class="btn btn-default btn-primary"><span class="glyphicon glyphicon-user"></span> {admin attr="firstname"} {admin attr="lastname"}</button>
+                                <button class="btn btn-default btn-primary dropdown-toggle" data-toggle="dropdown">
+                                    <span class="caret"></span>
+                                </button>
+                                <ul class="dropdown-menu">
+                                    <li><a class="profile" href="{url path='admin/edit_profile'}"><span class="glyphicon glyphicon-edit"></span> {intl l="Profil"}</a></li>
+                                    <li><a class="logout" href="{url path='admin/logout'}" title="{intl l='Close administation session'}"><span class="glyphicon glyphicon-off"></span> {intl l="Logout"}</a></li>
+                                </ul>
+                            </div>
+                        </div>
+
 		            </div>
 
 		    		{module_include location='inside_topbar'}
-
-		            <div class="col-md-6 clearfix">
-
-		                <div class="btn-group pull-right">
-		                    <a href="{navigate to="index"}" title="{intl l='View site'}" target="_blank" class="btn btn-default"><span class="glyphicon glyphicon-eye-open"></span> {intl l="View shop"}</a>
-		                    <button class="btn btn-default btn-primary"><span class="glyphicon glyphicon-user"></span> {admin attr="firstname"} {admin attr="lastname"}</button>
-		                    <button class="btn btn-default btn-primary dropdown-toggle" data-toggle="dropdown">
-		                        <span class="caret"></span>
-		                    </button>
-		                    <ul class="dropdown-menu">
-		                        <li><a class="profile" href="{url path='admin/edit_profile'}"><span class="glyphicon glyphicon-edit"></span> {intl l="Profil"}</a></li>
-		                        <li><a class="logout" href="{url path='admin/logout'}" title="{intl l='Close administation session'}"><span class="glyphicon glyphicon-off"></span> {intl l="Logout"}</a></li>
-		                    </ul>
-		                </div>
-
-		            </div>
+		            
 		        </div>
 
 		    </div>
@@ -86,96 +86,98 @@
 		<nav class="navbar navbar-default" role="navigation">
 
             <div class="container">
+                
+                <div class="row">
+        			<div class="navbar-header">
+        				<button type="button" class="btn navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+        					<span class="sr-only">Toggle navigation</span>
+        					<span class="icon-bar"></span>
+        					<span class="icon-bar"></span>
+        					<span class="icon-bar"></span>
+        				</button>
+        			</div>
 
-    			<div class="navbar-header">
-    				<button type="button" class="btn navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-    					<span class="sr-only">Toggle navigation</span>
-    					<span class="icon-bar"></span>
-    					<span class="icon-bar"></span>
-    					<span class="icon-bar"></span>
-    				</button>
-    			</div>
+        			<div class="collapse navbar-collapse navbar-collapse">
+        				<ul class="nav navbar-nav">
 
-    			<div class="collapse navbar-collapse navbar-collapse">
-    				<ul class="nav navbar-nav">
+                            <li class="{if $admin_current_location == 'home'}active{/if}" id="home_menu">
+                                <a href="{url path='/admin/home'}">{intl l="Home"}</a>
+                            </li>
 
-                        <li class="{if $admin_current_location == 'home'}active{/if}" id="home_menu">
-                            <a href="{url path='/admin/home'}">{intl l="Home"}</a>
-                        </li>
+                            {loop name="menu-auth-customer" type="auth" roles="ADMIN" permissions="admin.customers.view"}
+                            <li class="{if $admin_current_location == 'customer'}active{/if}" id="customers_menu">
+                                <a href="{url path='/admin/customers'}">{intl l="Customers"}</a>
+                            </li>
+                            {/loop}
 
-                        {loop name="menu-auth-customer" type="auth" roles="ADMIN" permissions="admin.customers.view"}
-                        <li class="{if $admin_current_location == 'customer'}active{/if}" id="customers_menu">
-                            <a href="{url path='/admin/customers'}">{intl l="Customers"}</a>
-                        </li>
+                            {loop name="menu-auth-order" type="auth" roles="ADMIN" permissions="admin.orders.view"}
+                            <li class="dropdown {if $admin_current_location == 'customer'}active{/if}" id="orders_menu" data-toggle="dropdown">
+
+                                <a href="#">{intl l="Orders"} <span class="caret"></span></a>
+
+                                 <ul class="dropdown-menu config_menu" role="menu">
+
+                                    <li role="menuitem"><a data-target="{url path='admin/orders'}" href="{url path='admin/orders'}">
+                                        {intl l="All orders"}
+                                        <span class="badge badge-important">{count type="order"}</span></a>
+                                    </li>
+
+                                    {loop name="order-status-list" type="order-status"}
+                                    <li role="menuitem">
+                                        <a data-target="{url path='admin/orders/$LABEL'}" href="{url path='admin/orders/$LABEL'}">
+                                            {$LABEL} <span class="badge badge-important">{count type="order" status="{$ID}"}</span>
+                                        </a>
+                                    </li>
+                                    {/loop}
+                                </ul>
+                            </li>
+                            {/loop}
+
+                            {loop name="menu-auth-catalog" type="auth" roles="ADMIN" permissions="admin.catalog.view"}
+                            <li class="{if $admin_current_location == 'catalog'}active{/if}" id="catalog_menu">
+                                <a href="{url path='/admin/catalog'}">{intl l="Catalog"}</a>
+                            </li>
+                            {/loop}
+
+                            {loop name="menu-auth-content" type="auth" roles="ADMIN" permissions="admin.folders.view"}
+                            <li class="{if $admin_current_location == 'folder'}active{/if}" id="folders_menu">
+                                <a href="{url path='/admin/folders'}">{intl l="Folders"}</a>
+                            </li>
+                            {/loop}
+
+                            {loop name="menu-auth-coupon" type="auth" roles="ADMIN" permissions="admin.coupon.view"}
+                            <li class="{if $admin_current_location == 'coupon'}active{/if}" id="coupon_menu">
+                                <a href="{url path='/admin/coupon/'}">{intl l="Coupons"}</a>
+                            </li>
+                            {/loop}
+
+                            {loop name="menu-auth-config" type="auth" roles="ADMIN" permissions="admin.config.view"}
+                            <li class="{if $admin_current_location == 'configuration'}active{/if}" id="config_menu">
+                                <a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a>
+                            </li>
+                            {/loop}
+
+                            {loop name="menu-auth-modules" type="auth" roles="ADMIN" permissions="admin.modules.view"}
+                            <li class="{if $admin_current_location == 'modules'}active{/if}" id="modules_menu">
+                                <a href="{url path='/admin/modules'}">{intl l="Modules"}</a>
+                            </li>
+
+                            {module_include location='in_top_menu_items'}
+
+                            {/loop}
+                        </ul>
+
+                        {loop name="top-bar-search" type="auth" roles="ADMIN" permissions="admin.search"}
+                        <form class="navbar-form pull-right hidden-xs" action="{url path='/admin/search'}">
+                            <div class="form-group">
+                                <input type="text" class="form-control" id="search_term" name="search_term" placeholder="{intl l='Search'}">
+                            </div>
+                            <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+                        </form>
                         {/loop}
 
-                        {loop name="menu-auth-order" type="auth" roles="ADMIN" permissions="admin.orders.view"}
-                        <li class="dropdown {if $admin_current_location == 'customer'}active{/if}" id="orders_menu" data-toggle="dropdown">
-
-                            <a href="#">{intl l="Orders"} <span class="caret"></span></a>
-
-                             <ul class="dropdown-menu config_menu" role="menu">
-
-                                <li role="menuitem"><a data-target="{url path='admin/orders'}" href="{url path='admin/orders'}">
-                                    {intl l="All orders"}
-                                    <span class="badge badge-important">{count type="order"}</span></a>
-                                </li>
-
-                                {loop name="order-status-list" type="order-status"}
-                                <li role="menuitem">
-                                    <a data-target="{url path='admin/orders/$LABEL'}" href="{url path='admin/orders/$LABEL'}">
-                                        {$LABEL} <span class="badge badge-important">{count type="order" status="{$ID}"}</span>
-                                    </a>
-                                </li>
-                                {/loop}
-                            </ul>
-                        </li>
-                        {/loop}
-
-                        {loop name="menu-auth-catalog" type="auth" roles="ADMIN" permissions="admin.catalog.view"}
-                        <li class="{if $admin_current_location == 'catalog'}active{/if}" id="catalog_menu">
-                            <a href="{url path='/admin/catalog'}">{intl l="Catalog"}</a>
-                        </li>
-                        {/loop}
-
-                        {loop name="menu-auth-content" type="auth" roles="ADMIN" permissions="admin.folders.view"}
-                        <li class="{if $admin_current_location == 'folder'}active{/if}" id="folders_menu">
-                            <a href="{url path='/admin/folders'}">{intl l="Folders"}</a>
-                        </li>
-                        {/loop}
-
-                        {loop name="menu-auth-coupon" type="auth" roles="ADMIN" permissions="admin.coupon.view"}
-                        <li class="{if $admin_current_location == 'coupon'}active{/if}" id="coupon_menu">
-                            <a href="{url path='/admin/coupon/'}">{intl l="Coupons"}</a>
-                        </li>
-                        {/loop}
-
-                        {loop name="menu-auth-config" type="auth" roles="ADMIN" permissions="admin.config.view"}
-                        <li class="{if $admin_current_location == 'configuration'}active{/if}" id="config_menu">
-                            <a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a>
-                        </li>
-                        {/loop}
-
-                        {loop name="menu-auth-modules" type="auth" roles="ADMIN" permissions="admin.modules.view"}
-                        <li class="{if $admin_current_location == 'modules'}active{/if}" id="modules_menu">
-                            <a href="{url path='/admin/modules'}">{intl l="Modules"}</a>
-                        </li>
-
-                        {module_include location='in_top_menu_items'}
-
-                        {/loop}
-                    </ul>
-
-                    {loop name="top-bar-search" type="auth" roles="ADMIN" permissions="admin.search"}
-                    <form class="navbar-form pull-right" action="{url path='/admin/search'}">
-                        <div class="form-group">
-                            <input type="text" class="form-control" id="search_term" name="search_term" placeholder="{intl l='Search'}">
-                        </div>
-                        <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
-                    </form>
-                    {/loop}
-
-    			</div>
+        			</div>
+                </div>
             </div>
 		</nav>
 
diff --git a/templates/admin/default/assets/less/thelia/grid.less b/templates/admin/default/assets/less/thelia/grid.less
new file mode 100644
index 000000000..6ea63b46b
--- /dev/null
+++ b/templates/admin/default/assets/less/thelia/grid.less
@@ -0,0 +1,11 @@
+@media (max-width: @screen-desktop) {
+	
+	.navbar-form{
+		width: 100%;
+		
+		.form-group{
+			width: 94%;
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/templates/admin/default/assets/less/thelia/navbar.less b/templates/admin/default/assets/less/thelia/navbar.less
index 26f9cd569..a0080e775 100755
--- a/templates/admin/default/assets/less/thelia/navbar.less
+++ b/templates/admin/default/assets/less/thelia/navbar.less
@@ -30,4 +30,8 @@
 
 .navbar-default .navbar-toggle .icon-bar{
 	background-color: @btn-primary-color;
+}
+
+.navbar-form{
+	padding: 0;
 }
\ No newline at end of file
diff --git a/templates/admin/default/assets/less/thelia/thelia.less b/templates/admin/default/assets/less/thelia/thelia.less
index 466f9d419..822130a5c 100644
--- a/templates/admin/default/assets/less/thelia/thelia.less
+++ b/templates/admin/default/assets/less/thelia/thelia.less
@@ -2,6 +2,7 @@
 @import "navbar.less";
 @import "scaffolding.less";
 @import "type.less";
+@import "grid.less";
 @import "breadcrumbs.less";
 @import "forms.less";
 @import "datepicker.less";

From af532ea271ca332c46aa08afef30f3a724bf0626 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Thu, 19 Sep 2013 16:45:38 +0200
Subject: [PATCH 20/51] change link to home page in front template

---
 templates/default/account.html        | 2 +-
 templates/default/address-update.html | 2 +-
 templates/default/address.html        | 4 ++--
 templates/default/login.html          | 2 +-
 templates/default/password.html       | 2 +-
 templates/default/product.html        | 2 +-
 templates/default/register.html       | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/default/account.html b/templates/default/account.html
index cffd5d754..187847ced 100644
--- a/templates/default/account.html
+++ b/templates/default/account.html
@@ -8,7 +8,7 @@
     <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
         <strong id="breadcrumb-label">{intl l="You are here"}: </strong>
         <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="index.php" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
             <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Account"}</span></li>
         </ul>
     </nav><!-- /.nav-breadcrumb -->
diff --git a/templates/default/address-update.html b/templates/default/address-update.html
index 51739d849..9e58e19ac 100644
--- a/templates/default/address-update.html
+++ b/templates/default/address-update.html
@@ -8,7 +8,7 @@
     <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
         <strong id="breadcrumb-label">{intl l="You are here"}: </strong>
         <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="index.php" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
             <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><span itemprop="title">{intl l="Account"}</span></li>
             <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Address"}</span></li>
         </ul>
diff --git a/templates/default/address.html b/templates/default/address.html
index bf7793766..b400fe87b 100644
--- a/templates/default/address.html
+++ b/templates/default/address.html
@@ -8,8 +8,8 @@
     <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
         <strong id="breadcrumb-label">You are here: </strong>
         <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="index.php" itemprop="url"><span itemprop="title">Home</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="index.php" itemprop="url"><span itemprop="title">Account</span></a></li>
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">Home</span></a></li>
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{url path="/customer/account"}" itemprop="url"><span itemprop="title">Account</span></a></li>
             <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Address"}</span></li>
         </ul>
     </nav><!-- /.nav-breadcrumb -->
diff --git a/templates/default/login.html b/templates/default/login.html
index 7a2da400a..11c86b908 100644
--- a/templates/default/login.html
+++ b/templates/default/login.html
@@ -4,7 +4,7 @@
     <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
         <strong id="breadcrumb-label">{intl l="You are here"}: </strong>
         <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{url path="/"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
             <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Login"}</span></li>
         </ul>
     </nav><!-- /.nav-breadcrumb -->
diff --git a/templates/default/password.html b/templates/default/password.html
index ec472a1f9..9168bd0a3 100644
--- a/templates/default/password.html
+++ b/templates/default/password.html
@@ -4,7 +4,7 @@
     <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
         <strong id="breadcrumb-label">{intl l="You are here"} </strong>
         <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{url path="/"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
             <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Password"}</span></li>
         </ul>
     </nav><!-- /.nav-breadcrumb -->
diff --git a/templates/default/product.html b/templates/default/product.html
index 8888ac606..fbce6d510 100644
--- a/templates/default/product.html
+++ b/templates/default/product.html
@@ -2,7 +2,7 @@
 
 {block name="breadcrumb"}
     <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
-        <strong id="breadcrumb-label">You are here: </strong>
+        <strong id="breadcrumb-label">{intl l="You are here"}: </strong>
         <ul class="breadcrumb" itemprop="breadcrumb">
             <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="index.php" itemprop="url"><span itemprop="title">Home</span></a></li>
             <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="category.php" itemprop="url"><span itemprop="title">Category 1</span></a></li>
diff --git a/templates/default/register.html b/templates/default/register.html
index a3448932b..ad7945457 100644
--- a/templates/default/register.html
+++ b/templates/default/register.html
@@ -4,7 +4,7 @@
     <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
         <strong id="breadcrumb-label">{intl l="You are here"}: </strong>
         <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{url path="/"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
             <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Register"}</span></li>
         </ul>
     </nav><!-- /.nav-breadcrumb -->

From 3ff1f7f9bb4579730784700ebfdd0150e26a1f9d Mon Sep 17 00:00:00 2001
From: franck <franck@cqfdev.fr>
Date: Thu, 19 Sep 2013 16:49:39 +0200
Subject: [PATCH 21/51] Added accessories management events

---
 core/lib/Thelia/Core/Event/TheliaEvents.php | 37 +++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php
index 6a024f33b..b99a5af1b 100755
--- a/core/lib/Thelia/Core/Event/TheliaEvents.php
+++ b/core/lib/Thelia/Core/Event/TheliaEvents.php
@@ -165,6 +165,17 @@ final class TheliaEvents
     const BEFORE_UPDATECATEGORY = "action.before_updateCategory";
     const AFTER_UPDATECATEGORY 	= "action.after_updateCategory";
 
+    // -- Categories Associated Content ----------------------------------------
+
+    const BEFORE_CREATECATEGORY_ASSOCIATED_CONTENT   = "action.before_createCategoryAssociatedContent";
+    const AFTER_CREATECATEGORY_ASSOCIATED_CONTENT 	= "action.after_createCategoryAssociatedContent";
+
+    const BEFORE_DELETECATEGORY_ASSOCIATED_CONTENT   = "action.before_deleteCategoryAssociatedContenty";
+    const AFTER_DELETECATEGORY_ASSOCIATED_CONTENT 	= "action.after_deleteproduct_accessory";
+
+    const BEFORE_UPDATECATEGORY_ASSOCIATED_CONTENT   = "action.before_updateCategoryAssociatedContent";
+    const AFTER_UPDATECATEGORY_ASSOCIATED_CONTENT 	= "action.after_updateCategoryAssociatedContent";
+
     // -- Product management -----------------------------------------------
 
     const PRODUCT_CREATE            = "action.createProduct";
@@ -176,6 +187,10 @@ final class TheliaEvents
     const PRODUCT_ADD_CONTENT      = "action.productAddContent";
     const PRODUCT_REMOVE_CONTENT   = "action.productRemoveContent";
 
+    const PRODUCT_ADD_ACCESSORY             = "action.productAddAccessory";
+    const PRODUCT_REMOVE_ACCESSORY          = "action.productRemoveAccessory";
+    const PRODUCT_UPDATE_ACCESSORY_POSITION = "action.updateProductPosition";
+
     const BEFORE_CREATEPRODUCT = "action.before_createproduct";
     const AFTER_CREATEPRODUCT  = "action.after_createproduct";
 
@@ -185,6 +200,28 @@ final class TheliaEvents
     const BEFORE_UPDATEPRODUCT = "action.before_updateProduct";
     const AFTER_UPDATEPRODUCT  = "action.after_updateProduct";
 
+    // -- Product Accessories --------------------------------------------------
+
+    const BEFORE_CREATEACCESSORY = "action.before_createAccessory";
+    const AFTER_CREATEACCESSORY  = "action.after_createAccessory";
+
+    const BEFORE_DELETEACCESSORY = "action.before_deleteAccessory";
+    const AFTER_DELETEACCESSORY  = "action.after_deleteAccessory";
+
+    const BEFORE_UPDATEACCESSORY = "action.before_updateAccessory";
+    const AFTER_UPDATEACCESSORY  = "action.after_updateAccessory";
+
+    // -- Product Associated Content --------------------------------------------------
+
+    const BEFORE_CREATEPRODUCT_ASSOCIATED_CONTENT   = "action.before_createProductAssociatedContent";
+    const AFTER_CREATEPRODUCT_ASSOCIATED_CONTENT 	= "action.after_createProductAssociatedContent";
+
+    const BEFORE_DELETEPRODUCT_ASSOCIATED_CONTENT   = "action.before_deleteProductAssociatedContenty";
+    const AFTER_DELETEPRODUCT_ASSOCIATED_CONTENT 	= "action.after_deleteproduct_accessory";
+
+    const BEFORE_UPDATEPRODUCT_ASSOCIATED_CONTENT   = "action.before_updateProductAssociatedContent";
+    const AFTER_UPDATEPRODUCT_ASSOCIATED_CONTENT 	= "action.after_updateProductAssociatedContent";
+
     /**
      * sent when a new existing cat id duplicated. This append when current customer is different from current cart
      */

From 4ecf388d8b88c926c120bb452781829effb9afc5 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Thu, 19 Sep 2013 16:55:50 +0200
Subject: [PATCH 22/51] refresh position in accessory

---
 core/lib/Thelia/Core/Template/Loop/Accessory.php     | 12 +++++++++++-
 .../Core/Template/Smarty/Plugins/TheliaLoop.php      |  2 ++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/lib/Thelia/Core/Template/Loop/Accessory.php b/core/lib/Thelia/Core/Template/Loop/Accessory.php
index 69b2e09d9..6dc269b62 100755
--- a/core/lib/Thelia/Core/Template/Loop/Accessory.php
+++ b/core/lib/Thelia/Core/Template/Loop/Accessory.php
@@ -93,8 +93,10 @@ class Accessory extends Product
         $accessories = $this->search($search);
 
         $accessoryIdList = array(0);
+        $accessoryPosition = array();
         foreach ($accessories as $accessory) {
             array_push($accessoryIdList, $accessory->getAccessory());
+            $accessoryPosition[$accessory->getAccessory()] = $accessory->getPosition();
         }
 
         $receivedIdList = $this->getId();
@@ -106,7 +108,15 @@ class Accessory extends Product
             $this->args->get('id')->setValue( implode(',', array_intersect($receivedIdList, $accessoryIdList)) );
         }
 
-        return parent::exec($pagination);
+        $loopResult = parent::exec($pagination);
+
+        foreach($loopResult as $loopResultRow) {
+            $loopResultRow
+                ->set("POSITION"         , $accessoryPosition[$loopResultRow->get('ID')])
+            ;
+        }
+
+        return $loopResult;
     }
 
 }
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
index 37801f4c8..bd2c10513 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
@@ -132,6 +132,8 @@ class TheliaLoop extends AbstractSmartyPlugin
 
             $loopResults = $loop->exec(self::$pagination[$name]);
 
+            $loopResults->rewind();
+
             $this->loopstack[$name] = $loopResults;
 
             // Pas de résultat ? la boucle est terminée, ne pas évaluer le contenu.

From 8a5f15c952e44f0092a69900776c2d6df74a1402 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Thu, 19 Sep 2013 17:01:17 +0200
Subject: [PATCH 23/51] All tables are now responsive

---
 .../default/ajax/template-attribute-list.html |   5 +-
 .../default/ajax/template-feature-list.html   |   4 +-
 templates/admin/default/attribute-edit.html   | 160 +++---
 templates/admin/default/attributes.html       | 198 +++----
 templates/admin/default/categories.html       | 306 +++++------
 templates/admin/default/category-edit.html    |  82 +--
 templates/admin/default/configuration.html    | 229 ++++----
 templates/admin/default/countries.html        | 138 ++---
 templates/admin/default/coupon-list.html      | 128 ++---
 templates/admin/default/coupon-read.html      | 230 ++++----
 templates/admin/default/currencies.html       | 302 +++++-----
 templates/admin/default/customer-edit.html    |  86 +--
 templates/admin/default/customers.html        | 202 +++----
 templates/admin/default/feature-edit.html     | 160 +++---
 templates/admin/default/features.html         | 198 +++----
 templates/admin/default/folders.html          | 301 +++++-----
 templates/admin/default/home.html             | 320 +++++------
 templates/admin/default/messages.html         | 122 ++--
 templates/admin/default/modules.html          | 356 ++++++------
 templates/admin/default/order-edit.html       | 519 +++++++++---------
 templates/admin/default/orders.html           | 178 +++---
 .../default/shipping-configuration-edit.html  | 102 ++--
 .../admin/default/shipping-configuration.html | 148 ++---
 .../admin/default/shipping-zones-edit.html    |  70 +--
 templates/admin/default/shipping-zones.html   | 120 ++--
 templates/admin/default/templates.html        | 142 ++---
 templates/admin/default/variables.html        |   2 +
 27 files changed, 2438 insertions(+), 2370 deletions(-)

diff --git a/templates/admin/default/ajax/template-attribute-list.html b/templates/admin/default/ajax/template-attribute-list.html
index 772ed5883..a630aaa61 100644
--- a/templates/admin/default/ajax/template-attribute-list.html
+++ b/templates/admin/default/ajax/template-attribute-list.html
@@ -25,7 +25,8 @@
     {/elseloop}
 </div>
 
-<table class="table table-striped table-condensed table-left-aligned">
+<div class="table-responsive">
+    <table class="table table-striped table-condensed table-left-aligned">
     <thead>
         <tr>
             <th>{intl l='ID'}</th>
@@ -72,7 +73,7 @@
          {/elseloop}
         </tbody>
     </table>
-
+</div>
 {* Delete value confirmation dialog *}
 
 {capture "delete_attribute_dialog"}
diff --git a/templates/admin/default/ajax/template-feature-list.html b/templates/admin/default/ajax/template-feature-list.html
index a20ff7125..58bb4cf8b 100644
--- a/templates/admin/default/ajax/template-feature-list.html
+++ b/templates/admin/default/ajax/template-feature-list.html
@@ -25,7 +25,8 @@
     {/elseloop}
 </div>
 
-<table class="table table-striped table-condensed table-left-aligned">
+<div class="table-responsive">
+    <table class="table table-striped table-condensed table-left-aligned">
     <thead>
         <tr>
             <th>{intl l='ID'}</th>
@@ -72,6 +73,7 @@
          {/elseloop}
         </tbody>
     </table>
+</div>
 
 {* Delete value confirmation dialog *}
 
diff --git a/templates/admin/default/attribute-edit.html b/templates/admin/default/attribute-edit.html
index 882edd60c..676a99baa 100644
--- a/templates/admin/default/attribute-edit.html
+++ b/templates/admin/default/attribute-edit.html
@@ -77,95 +77,97 @@
 		     						    <div class="alert alert-info">
 		     						     {intl l="Enter here all possible attribute values."}
 		     						    </div>
+                                        
+                                        <div class="table-responsive">
+    				                        <table class="table table-striped table-condensed table-left-aligned">
+    				                            <thead>
+    				                                <tr>
+    				                                    <th>
+    				                                        {admin_sortable_header
+    				                                            current_order=$attributeav_order
+    				                                            order='id'
+    				                                            reverse_order='id_reverse'
+    				                                            request_parameter_name='attributeav_order'
+    				                                            path={url path='/admin/configuration/attributes/update' attribute_id=$attribute_id}
+    				                                            label="{intl l='ID'}"
+    				                                        }
+    				                                    </th>
 
-				                        <table class="table table-striped table-condensed table-left-aligned">
-				                            <thead>
-				                                <tr>
-				                                    <th>
-				                                        {admin_sortable_header
-				                                            current_order=$attributeav_order
-				                                            order='id'
-				                                            reverse_order='id_reverse'
-				                                            request_parameter_name='attributeav_order'
-				                                            path={url path='/admin/configuration/attributes/update' attribute_id=$attribute_id}
-				                                            label="{intl l='ID'}"
-				                                        }
-				                                    </th>
+    				                                    <th>
+    				                                        {admin_sortable_header
+    				                                            current_order=$attributeav_order
+    				                                            order='alpha'
+    				                                            reverse_order='alpha_reverse'
+    				                                            request_parameter_name='attributeav_order'
+    				                                            path={url path='/admin/configuration/attributes/update' attribute_id=$attribute_id}
+    				                                            label="{intl l='Value'}"
+    				                                        }
+    				                                    </th>
 
-				                                    <th>
-				                                        {admin_sortable_header
-				                                            current_order=$attributeav_order
-				                                            order='alpha'
-				                                            reverse_order='alpha_reverse'
-				                                            request_parameter_name='attributeav_order'
-				                                            path={url path='/admin/configuration/attributes/update' attribute_id=$attribute_id}
-				                                            label="{intl l='Value'}"
-				                                        }
-				                                    </th>
+    				                                    <th class="text-center">
+    				                                        {admin_sortable_header
+    				                                            current_order=$attributeav_order
+    				                                            order='manual'
+    				                                            reverse_order='manual_reverse'
+    				                                            request_parameter_name='attributeav_order'
+    				                                            path={url path='/admin/configuration/attributes/update' attribute_id=$attribute_id}
+    				                                            label="{intl l="Position"}"
+    				                                        }
+    				                                    </th>
 
-				                                    <th class="text-center">
-				                                        {admin_sortable_header
-				                                            current_order=$attributeav_order
-				                                            order='manual'
-				                                            reverse_order='manual_reverse'
-				                                            request_parameter_name='attributeav_order'
-				                                            path={url path='/admin/configuration/attributes/update' attribute_id=$attribute_id}
-				                                            label="{intl l="Position"}"
-				                                        }
-				                                    </th>
+    				                                    {module_include location='attributes_value_table_header'}
 
-				                                    {module_include location='attributes_value_table_header'}
+    				                                    <th class="actions">{intl l="Actions"}</th>
+    				                                </tr>
+    				                            </thead>
 
-				                                    <th class="actions">{intl l="Actions"}</th>
-				                                </tr>
-				                            </thead>
+    				                            <tbody>
+    				                                {loop name="list" type="attribute_availability" attribute=$attribute_id backend_context="1" lang=$edit_language_id order=$attributeav_order}
+    				                                <tr>
+    				                                    <td>{$ID}</td>
 
-				                            <tbody>
-				                                {loop name="list" type="attribute_availability" attribute=$attribute_id backend_context="1" lang=$edit_language_id order=$attributeav_order}
-				                                <tr>
-				                                    <td>{$ID}</td>
+    				                                    <td>
+    				                                        {* FIXME : integrate this in the encolsing form to provide standard form processing *}
+    				                                        <input class="js-edit form-control" type="text" name="attribute_values[{$ID}]" value="{$TITLE}" />
+    				                                    </td>
 
-				                                    <td>
-				                                        {* FIXME : integrate this in the encolsing form to provide standard form processing *}
-				                                        <input class="js-edit form-control" type="text" name="attribute_values[{$ID}]" value="{$TITLE}" />
-				                                    </td>
+    				                                    <td class="text-center">
+    				                                        {admin_position_block
+    				                                        permission="admin.attributes.edit"
+    				                                        path={url path='/admin/configuration/attributes-av/update-position' attribute_id=$attribute_id}
+    				                                        url_parameter="attributeav_id"
+    				                                        in_place_edit_class="positionChange"
+    				                                        position="$POSITION"
+    				                                        id="$ID"
+    				                                        }
+    				                                    </td>
 
-				                                    <td class="text-center">
-				                                        {admin_position_block
-				                                        permission="admin.attributes.edit"
-				                                        path={url path='/admin/configuration/attributes-av/update-position' attribute_id=$attribute_id}
-				                                        url_parameter="attributeav_id"
-				                                        in_place_edit_class="positionChange"
-				                                        position="$POSITION"
-				                                        id="$ID"
-				                                        }
-				                                    </td>
+    				                                    {module_include location='attributes_value_table_row'}
 
-				                                    {module_include location='attributes_value_table_row'}
+    				                                    <td class="actions">
+    				                                        <div class="btn-group">
+    				                                            {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.attribute-av.delete"}
+    				                                               <a class="btn btn-default btn-xs value-delete" title="{intl l='Delete this value'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal">
+    				                                                <span class="glyphicon glyphicon-trash"></span>
+    				                                               </a>
+    				                                            {/loop}
+    				                                        </div>
+    				                                    </td>
+    				                                </tr>
+    				                                 {/loop}
 
-				                                    <td class="actions">
-				                                        <div class="btn-group">
-				                                            {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.attribute-av.delete"}
-				                                               <a class="btn btn-default btn-xs value-delete" title="{intl l='Delete this value'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal">
-				                                                <span class="glyphicon glyphicon-trash"></span>
-				                                               </a>
-				                                            {/loop}
-				                                        </div>
-				                                    </td>
-				                                </tr>
-				                                 {/loop}
-
-				                                 {elseloop rel="list"}
-				                                     <tr>
-				                                         <td colspan="4">
-				                                             <div class="alert alert-info">
-				                                                 {intl l="No value has been created yet. Click the + button to create one."}
-				                                             </div>
-				                                         </td>
-				                                     </tr>
-				                                 {/elseloop}
-				                            </tbody>
-				                        </table>
+    				                                 {elseloop rel="list"}
+    				                                     <tr>
+    				                                         <td colspan="4">
+    				                                             <div class="alert alert-info">
+    				                                                 {intl l="No value has been created yet. Click the + button to create one."}
+    				                                             </div>
+    				                                         </td>
+    				                                     </tr>
+    				                                 {/elseloop}
+    				                            </tbody>
+    				                        </table>
+                                        </div>
 		     						</div>
 		     				    </form>
 	     			            {/form}
diff --git a/templates/admin/default/attributes.html b/templates/admin/default/attributes.html
index 348219f5c..c207d02fa 100644
--- a/templates/admin/default/attributes.html
+++ b/templates/admin/default/attributes.html
@@ -21,117 +21,119 @@
             <div class="col-md-12">
                 <form action="#" method="post">
 	                <div class="general-block-decorator">
-	                    <table class="table table-striped table-condensed table-left-aligned">
-	                        <caption>
-	                           {intl l='Thelia product attributes'}
+                        <div class="table-responsive">
+    	                    <table class="table table-striped table-condensed table-left-aligned">
+    	                        <caption>
+    	                           {intl l='Thelia product attributes'}
 
-                                {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.attributes.create"}
-                                <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new product attribute'}" href="#creation_dialog" data-toggle="modal">
-                                    <span class="glyphicon glyphicon-plus-sign"></span>
-                                </a>
-                                {/loop}
-	                        </caption>
-                            <thead>
-                                <tr>
-                                    <th>
-                                        {admin_sortable_header
-	                                        current_order=$order
-	                                        order='id'
-	                                        reverse_order='id_reverse'
-	                                        path='/admin/configuration/attributes'
-	                                        label="{intl l='ID'}"
-                                        }
-                                    </th>
+                                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.attributes.create"}
+                                    <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new product attribute'}" href="#creation_dialog" data-toggle="modal">
+                                        <span class="glyphicon glyphicon-plus-sign"></span>
+                                    </a>
+                                    {/loop}
+    	                        </caption>
+                                <thead>
+                                    <tr>
+                                        <th>
+                                            {admin_sortable_header
+    	                                        current_order=$order
+    	                                        order='id'
+    	                                        reverse_order='id_reverse'
+    	                                        path='/admin/configuration/attributes'
+    	                                        label="{intl l='ID'}"
+                                            }
+                                        </th>
 
-                                    <th>
-                                        {admin_sortable_header
-	                                        current_order=$order
-	                                        order='alpha'
-	                                        reverse_order='alpha_reverse'
-	                                        path='/admin/configuration/attributes'
-	                                        label="{intl l='Title'}"
-                                        }
-                                    </th>
+                                        <th>
+                                            {admin_sortable_header
+    	                                        current_order=$order
+    	                                        order='alpha'
+    	                                        reverse_order='alpha_reverse'
+    	                                        path='/admin/configuration/attributes'
+    	                                        label="{intl l='Title'}"
+                                            }
+                                        </th>
 
-                                    <th class="text-center">
-                                        {admin_sortable_header
-	                                        current_order=$order
-	                                        order='manual'
-	                                        reverse_order='manual_reverse'
-	                                        path='/admin/configuration/attributes'
-	                                        label="{intl l="Position"}"
-                                        }
-                                    </th>
+                                        <th class="text-center">
+                                            {admin_sortable_header
+    	                                        current_order=$order
+    	                                        order='manual'
+    	                                        reverse_order='manual_reverse'
+    	                                        path='/admin/configuration/attributes'
+    	                                        label="{intl l="Position"}"
+                                            }
+                                        </th>
 
-                                    {module_include location='attributes_table_header'}
+                                        {module_include location='attributes_table_header'}
 
-                                    <th class="actions">{intl l="Actions"}</th>
-                                </tr>
-                            </thead>
+                                        <th class="actions">{intl l="Actions"}</th>
+                                    </tr>
+                                </thead>
 
-                            <tbody>
-                                {loop name="list" type="attribute" backend_context="1" lang=$lang_id order=$order}
-                                <tr>
-                                    <td>{$ID}</td>
+                                <tbody>
+                                    {loop name="list" type="attribute" backend_context="1" lang=$lang_id order=$order}
+                                    <tr>
+                                        <td>{$ID}</td>
 
-                                    <td>
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.attributes.change"}
-                                            <a title="{intl l='Change this attribute'}" href="{url path='/admin/configuration/attributes/update' attribute_id=$ID}">{$TITLE}</a>
-                                        {/loop}
-                                        {elseloop rel="can_change"}
-                                            {$TITLE}
-                                        {/elseloop}
-                                    </td>
+                                        <td>
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.attributes.change"}
+                                                <a title="{intl l='Change this attribute'}" href="{url path='/admin/configuration/attributes/update' attribute_id=$ID}">{$TITLE}</a>
+                                            {/loop}
+                                            {elseloop rel="can_change"}
+                                                {$TITLE}
+                                            {/elseloop}
+                                        </td>
 
-                                    <td class="text-center">
-                                        {admin_position_block
-                                        permission="admin.attributes.edit"
-                                        path="/admin/configuration/attributes/update-position"
-                                        url_parameter="attribute_id"
-                                        in_place_edit_class="positionChange"
-                                        position="$POSITION"
-                                        id="$ID"
-                                        }
-                                    </td>
+                                        <td class="text-center">
+                                            {admin_position_block
+                                            permission="admin.attributes.edit"
+                                            path="/admin/configuration/attributes/update-position"
+                                            url_parameter="attribute_id"
+                                            in_place_edit_class="positionChange"
+                                            position="$POSITION"
+                                            id="$ID"
+                                            }
+                                        </td>
 
-                                    {module_include location='attributes_table_row'}
+                                        {module_include location='attributes_table_row'}
 
-                                    <td class="actions">
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.attributes.change"}
-                                        <div class="btn-group">
-                                            <a class="btn btn-default btn-xs attribute-remove-from-all" title="{intl l='Remove this attribute from all product templates'}" href="#remove_from_all_dialog" data-id="{$ID}" data-toggle="modal">
-                                                <span class="glyphicon glyphicon-minus"></span>
-                                            </a>
-                                            <a class="btn btn-default btn-xs attribute-add-to-all" title="{intl l='Add this attribute to all product templates'}" href="#add_to_all_dialog" data-id="{$ID}" data-toggle="modal">
-                                                <span class="glyphicon glyphicon-plus"></span>
-                                            </a>
-                                        </div>
-                                        {/loop}
+                                        <td class="actions">
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.attributes.change"}
+                                            <div class="btn-group">
+                                                <a class="btn btn-default btn-xs attribute-remove-from-all" title="{intl l='Remove this attribute from all product templates'}" href="#remove_from_all_dialog" data-id="{$ID}" data-toggle="modal">
+                                                    <span class="glyphicon glyphicon-minus"></span>
+                                                </a>
+                                                <a class="btn btn-default btn-xs attribute-add-to-all" title="{intl l='Add this attribute to all product templates'}" href="#add_to_all_dialog" data-id="{$ID}" data-toggle="modal">
+                                                    <span class="glyphicon glyphicon-plus"></span>
+                                                </a>
+                                            </div>
+                                            {/loop}
 
-                                        <div class="btn-group">
-	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.attributes.change"}
-	                                            <a class="btn btn-default btn-xs attribute-change" title="{intl l='Change this product attribute'}" href="{url path='/admin/configuration/attributes/update' attribute_id=$ID}"><span class="glyphicon glyphicon-edit"></span></a>
-	                                        {/loop}
+                                            <div class="btn-group">
+    	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.attributes.change"}
+    	                                            <a class="btn btn-default btn-xs attribute-change" title="{intl l='Change this product attribute'}" href="{url path='/admin/configuration/attributes/update' attribute_id=$ID}"><span class="glyphicon glyphicon-edit"></span></a>
+    	                                        {/loop}
 
-	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.attributes.delete"}
-	                                            <a class="btn btn-default btn-xs attribute-delete" title="{intl l='Delete this product attribute'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-	                                        {/loop}
-                                        </div>
-                                    </td>
-                                </tr>
-                                 {/loop}
+    	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.attributes.delete"}
+    	                                            <a class="btn btn-default btn-xs attribute-delete" title="{intl l='Delete this product attribute'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+    	                                        {/loop}
+                                            </div>
+                                        </td>
+                                    </tr>
+                                     {/loop}
 
-                                 {elseloop rel="list"}
-                                     <tr>
-                                         <td colspan="4">
-                                             <div class="alert alert-info">
-                                                 {intl l="No product attribute has been created yet. Click the + button to create one."}
-                                             </div>
-                                         </td>
-                                     </tr>
-                                 {/elseloop}
-                            </tbody>
-	                    </table>
+                                     {elseloop rel="list"}
+                                         <tr>
+                                             <td colspan="4">
+                                                 <div class="alert alert-info">
+                                                     {intl l="No product attribute has been created yet. Click the + button to create one."}
+                                                 </div>
+                                             </td>
+                                         </tr>
+                                     {/elseloop}
+                                </tbody>
+    	                    </table>
+                        </div>
 	                </div>
                 </form>
             </div>
diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html
index 3c2e6f00a..b24b625cb 100755
--- a/templates/admin/default/categories.html
+++ b/templates/admin/default/categories.html
@@ -15,163 +15,164 @@
 
         <div class="row">
             <div class="col-md-12">
-            <div class="general-block-decorator">
-
-                 <table class="table table-striped table-condensed" id="category_list">
-                     <caption>
-                         {* display parent category name, and get current cat ID *}
-                         {loop name="category_title" type="category" visible="*" id=$category_id}
-                             {intl l="Categories in %cat" cat=$TITLE}
-                             {$cat_id = $ID}
-                         {/loop}
-                         {elseloop rel="category_title"}
-                             {intl l="Top level categories"}
-                         {/elseloop}
-
-                         {module_include location='category_list_caption'}
-
-                         {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.categories.create"}
-                         <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new category'}" href="#category_creation_dialog" data-toggle="modal">
-                             <span class="glyphicon glyphicon-plus-sign"></span>
-                         </a>
-                         {/loop}
-                     </caption>
-
-                     {ifloop rel="category_list"}
-                         <thead>
-                             <tr>
-                                 <th class="object-title">
-                                 {admin_sortable_header
-                                    current_order=$category_order
-                                    order='id'
-                                    reverse_order='id_reverse'
-                                    path={url path='/admin/categories' id_category=$category_id}
-                                    request_parameter_name='category_order'
-                                    label="{intl l='ID'}"
-                                 }
-                                 </th>
-
-                                 <th class="object-image">&nbsp;</th>
-
-                                 <th class="object-title">
-                                 {admin_sortable_header
-                                    current_order=$category_order
-                                    order='alpha'
-                                    reverse_order='alpha_reverse'
-                                    path={url path='/admin/categories' id_category=$category_id}
-                                    request_parameter_name='category_order'
-                                    label="{intl l='Category title'}"
-                                 }
-                                 </th>
-
-                                 {module_include location='category_list_header'}
-
-                                 <th>
-                                 {admin_sortable_header
-                                    current_order=$category_order
-                                    order='visible'
-                                    reverse_order='visible_reverse'
-                                    path={url path='/admin/categories' id_category=$category_id}
-                                    request_parameter_name='category_order'
-                                    label="{intl l='Online'}"
-                                 }
-                                 </th>
-
-                                 <th>
-                                 {admin_sortable_header
-                                    current_order=$category_order
-                                    order='manual'
-                                    reverse_order='manual_reverse'
-                                    path={url path='/admin/categories' id_category=$category_id}
-                                    request_parameter_name='category_order'
-                                    label="{intl l='Position'}"
-                                 }
-                                 </th>
-
-                                 <th class="actions">{intl l='Actions'}</th>
-                             </tr>
-                         </thead>
-
-                         <tbody>
-                         {loop name="category_list" type="category" visible="*" parent=$category_id order=$category_order backend_context="1" lang=$lang_id}
-                         <tr>
-                             <td>{$ID}</td>
-
-                             <td>
-                             {loop type="image" name="cat_image" source="category" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
-                               <a href="{url path='admin/catalog' category_id=$ID}" title="{intl l='Browse this category'}"><img class="img-thumbnail" src="{$IMAGE_URL}" alt="{$TITLE}" /></a>
-                             {/loop}
-                             </td>
-
-                             <td class="object-title">
-                                  <a href="{url path='admin/catalog' category_id=$ID}" title="{intl l='Browse this category'}">
-                                    {$TITLE}
-                                  </a>
-                             </td>
-
-                             {module_include location='category_list_row'}
-
-                             <td>
-                                 {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.categories.edit"}
-                                     <div class="make-switch switch-small categoryVisibleToggle" data-id="{$ID}"  data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
-                                         <input type="checkbox" class="categoryVisibleToggle" {if $VISIBLE == 1}checked="checked"{/if}>
-                                     </div>
+                <div class="general-block-decorator">
+                    <div class="table-responsive">
+                         <table class="table table-striped table-condensed" id="category_list">
+                             <caption>
+                                 {* display parent category name, and get current cat ID *}
+                                 {loop name="category_title" type="category" visible="*" id=$category_id}
+                                     {intl l="Categories in %cat" cat=$TITLE}
+                                     {$cat_id = $ID}
                                  {/loop}
-
-                                 {elseloop rel="can_change"}
-                                     <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
-                                         <input type="checkbox" class="disabled" disabled="disabled" {if $VISIBLE == 1}checked="checked"{/if}>
-                                     </div>
+                                 {elseloop rel="category_title"}
+                                     {intl l="Top level categories"}
                                  {/elseloop}
-                             </td>
 
-                             <td>
-                             {admin_position_block
-                                 permission="admin.categories.edit"
-                                 path={url path='admin/categories/update-position' category_id=$ID}
-                                 url_parameter="category_id"
-                                 in_place_edit_class="categoryPositionChange"
-                                 position=$POSITION
-                                 id=$ID
-                              }
-                             </td>
+                                 {module_include location='category_list_caption'}
 
-                             <td class="actions">
-                                 <div class="btn-group">
-                                     <a class="btn btn-default btn-xs" title="{intl l='Browse this category'}" href="{url path='admin/categories' category_id=$ID}"><i class="glyphicon glyphicon-folder-open"></i></a>
-
-                                     {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.categories.edit"}
-                                        <a class="btn btn-default btn-xs" title="{intl l='Edit this category'}" href="{url path='/admin/categories/update' category_id=$ID}"><i class="glyphicon glyphicon-edit"></i></a>
-                                     {/loop}
-
-                                     {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.categories.delete"}
-                                        <a class="btn btn-default btn-xs category-delete" title="{intl l='Delete this category and all its contents'}"  href="#category_delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
-                                     {/loop}
-                                 </div>
-                              </td>
-                         </tr>
-                         {/loop}
-                         </tbody>
-                     {/ifloop}
-
-                     {elseloop rel="category_list"}
-                     <thead>
-                         <tr>
-                             <td class="message">
-                                 <div class="alert alert-info">
                                  {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.categories.create"}
-                                     {intl l="This category has no sub-categories. To create a new one, click the + button above."}
+                                 <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new category'}" href="#category_creation_dialog" data-toggle="modal">
+                                     <span class="glyphicon glyphicon-plus-sign"></span>
+                                 </a>
                                  {/loop}
+                             </caption>
 
-                                 {elseloop rel="can_create"}
-                                    {intl l="This category has no sub-categories."}
-                                 {/elseloop}
-                                 </div>
-                             </td>
-                         </tr>
-                     </thead>
-                     {/elseloop}
-                 </table>
+                             {ifloop rel="category_list"}
+                                 <thead>
+                                     <tr>
+                                         <th class="object-title">
+                                         {admin_sortable_header
+                                            current_order=$category_order
+                                            order='id'
+                                            reverse_order='id_reverse'
+                                            path={url path='/admin/categories' id_category=$category_id}
+                                            request_parameter_name='category_order'
+                                            label="{intl l='ID'}"
+                                         }
+                                         </th>
+
+                                         <th class="object-image">&nbsp;</th>
+
+                                         <th class="object-title">
+                                         {admin_sortable_header
+                                            current_order=$category_order
+                                            order='alpha'
+                                            reverse_order='alpha_reverse'
+                                            path={url path='/admin/categories' id_category=$category_id}
+                                            request_parameter_name='category_order'
+                                            label="{intl l='Category title'}"
+                                         }
+                                         </th>
+
+                                         {module_include location='category_list_header'}
+
+                                         <th>
+                                         {admin_sortable_header
+                                            current_order=$category_order
+                                            order='visible'
+                                            reverse_order='visible_reverse'
+                                            path={url path='/admin/categories' id_category=$category_id}
+                                            request_parameter_name='category_order'
+                                            label="{intl l='Online'}"
+                                         }
+                                         </th>
+
+                                         <th>
+                                         {admin_sortable_header
+                                            current_order=$category_order
+                                            order='manual'
+                                            reverse_order='manual_reverse'
+                                            path={url path='/admin/categories' id_category=$category_id}
+                                            request_parameter_name='category_order'
+                                            label="{intl l='Position'}"
+                                         }
+                                         </th>
+
+                                         <th class="actions">{intl l='Actions'}</th>
+                                     </tr>
+                                 </thead>
+
+                                 <tbody>
+                                 {loop name="category_list" type="category" visible="*" parent=$category_id order=$category_order backend_context="1" lang=$lang_id}
+                                 <tr>
+                                     <td>{$ID}</td>
+
+                                     <td>
+                                     {loop type="image" name="cat_image" source="category" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
+                                       <a href="{url path='admin/catalog' category_id=$ID}" title="{intl l='Browse this category'}"><img class="img-thumbnail" src="{$IMAGE_URL}" alt="{$TITLE}" /></a>
+                                     {/loop}
+                                     </td>
+
+                                     <td class="object-title">
+                                          <a href="{url path='admin/catalog' category_id=$ID}" title="{intl l='Browse this category'}">
+                                            {$TITLE}
+                                          </a>
+                                     </td>
+
+                                     {module_include location='category_list_row'}
+
+                                     <td>
+                                         {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.categories.edit"}
+                                             <div class="make-switch switch-small categoryVisibleToggle" data-id="{$ID}"  data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                                 <input type="checkbox" class="categoryVisibleToggle" {if $VISIBLE == 1}checked="checked"{/if}>
+                                             </div>
+                                         {/loop}
+
+                                         {elseloop rel="can_change"}
+                                             <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                                 <input type="checkbox" class="disabled" disabled="disabled" {if $VISIBLE == 1}checked="checked"{/if}>
+                                             </div>
+                                         {/elseloop}
+                                     </td>
+
+                                     <td>
+                                     {admin_position_block
+                                         permission="admin.categories.edit"
+                                         path={url path='admin/categories/update-position' category_id=$ID}
+                                         url_parameter="category_id"
+                                         in_place_edit_class="categoryPositionChange"
+                                         position=$POSITION
+                                         id=$ID
+                                      }
+                                     </td>
+
+                                     <td class="actions">
+                                         <div class="btn-group">
+                                             <a class="btn btn-default btn-xs" title="{intl l='Browse this category'}" href="{url path='admin/categories' category_id=$ID}"><i class="glyphicon glyphicon-folder-open"></i></a>
+
+                                             {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.categories.edit"}
+                                                <a class="btn btn-default btn-xs" title="{intl l='Edit this category'}" href="{url path='/admin/categories/update' category_id=$ID}"><i class="glyphicon glyphicon-edit"></i></a>
+                                             {/loop}
+
+                                             {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.categories.delete"}
+                                                <a class="btn btn-default btn-xs category-delete" title="{intl l='Delete this category and all its contents'}"  href="#category_delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                             {/loop}
+                                         </div>
+                                      </td>
+                                 </tr>
+                                 {/loop}
+                                 </tbody>
+                             {/ifloop}
+
+                             {elseloop rel="category_list"}
+                             <thead>
+                                 <tr>
+                                     <td class="message">
+                                         <div class="alert alert-info">
+                                         {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.categories.create"}
+                                             {intl l="This category has no sub-categories. To create a new one, click the + button above."}
+                                         {/loop}
+
+                                         {elseloop rel="can_create"}
+                                            {intl l="This category has no sub-categories."}
+                                         {/elseloop}
+                                         </div>
+                                     </td>
+                                 </tr>
+                             </thead>
+                             {/elseloop}
+                         </table>
+                     </div>
                 </div>
             </div>
         </div>
@@ -181,7 +182,7 @@
      <div class="row">
          <div class="col-md-12">
              <div class="general-block-decorator">
-
+                <div class="table-responsive">
                  <table class="table table-striped table-condensed">
                      <caption>
                          {* display parent category name *}
@@ -326,8 +327,7 @@
                      </thead>
                      {/elseloop}
                  </table>
-
-
+                </div>
              </div>
             </div>
         </div>
diff --git a/templates/admin/default/category-edit.html b/templates/admin/default/category-edit.html
index ddf39f5f2..05c9c02f8 100755
--- a/templates/admin/default/category-edit.html
+++ b/templates/admin/default/category-edit.html
@@ -194,54 +194,56 @@
 
 									    </form>
 									</div>
+									
+									<div class="table-responsive">
+										<table class="table table-striped table-condensed table-left-aligned">
+										    <thead>
+										        <tr>
+										            <th>{intl l='ID'}</th>
 
-									<table class="table table-striped table-condensed table-left-aligned">
-									    <thead>
-									        <tr>
-									            <th>{intl l='ID'}</th>
+										            <th>{intl l='Attribute title'}</th>
 
-									            <th>{intl l='Attribute title'}</th>
+										            {module_include location='category_contents_table_header'}
 
-									            {module_include location='category_contents_table_header'}
+										            <th class="actions">{intl l="Actions"}</th>
+										        </tr>
+										    </thead>
 
-									            <th class="actions">{intl l="Actions"}</th>
-									        </tr>
-									    </thead>
+										    <tbody>
+										        {loop name="assigned_contents" type="associated_content" category="$category_id" backend_context="1" lang="$edit_language_id"}
+										        <tr>
+										            <td>{$ID}</td>
 
-									    <tbody>
-									        {loop name="assigned_contents" type="associated_content" category="$category_id" backend_context="1" lang="$edit_language_id"}
-									        <tr>
-									            <td>{$ID}</td>
+										            <td>
+										                {$TITLE}
+										            </td>
 
-									            <td>
-									                {$TITLE}
-									            </td>
+										            {module_include location='category_contents_table_row'}
 
-									            {module_include location='category_contents_table_row'}
+										            <td class="actions">
+										                <div class="btn-group">
+										                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.category.content.delete"}
+										                       <a class="btn btn-default btn-xs delete-content" title="{intl l='Delete this content'}" href="#delete_content_dialog" data-id="{$ID}" data-toggle="modal">
+										                        <span class="glyphicon glyphicon-trash"></span>
+										                       </a>
+										                    {/loop}
+										                </div>
+										            </td>
+										        </tr>
+										         {/loop}
 
-									            <td class="actions">
-									                <div class="btn-group">
-									                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.category.content.delete"}
-									                       <a class="btn btn-default btn-xs delete-content" title="{intl l='Delete this content'}" href="#delete_content_dialog" data-id="{$ID}" data-toggle="modal">
-									                        <span class="glyphicon glyphicon-trash"></span>
-									                       </a>
-									                    {/loop}
-									                </div>
-									            </td>
-									        </tr>
-									         {/loop}
-
-									         {elseloop rel="assigned_contents"}
-									             <tr>
-									                 <td colspan="3">
-									                     <div class="alert alert-info">
-									                         {intl l="This category contains no contents"}
-									                     </div>
-									                 </td>
-									             </tr>
-									         {/elseloop}
-									    </tbody>
-									</table>
+										         {elseloop rel="assigned_contents"}
+										             <tr>
+										                 <td colspan="3">
+										                     <div class="alert alert-info">
+										                         {intl l="This category contains no contents"}
+										                     </div>
+										                 </td>
+										             </tr>
+										         {/elseloop}
+										    </tbody>
+										</table>
+									</div>
 			                    </div>
 		                    </div>
 
diff --git a/templates/admin/default/configuration.html b/templates/admin/default/configuration.html
index 0bf0e9bed..50e9296ac 100644
--- a/templates/admin/default/configuration.html
+++ b/templates/admin/default/configuration.html
@@ -17,151 +17,156 @@
 
 	        <div class="col-md-4">
 	            <div class="menu-list-table general-block-decorator">
-		            <table class="table table-striped table-condensed">
-		                <caption>{intl l='Product catalog configuration'}</caption>
+	            	<div class="table-responsive">
+			            <table class="table table-striped table-condensed">
+			                <caption>{intl l='Product catalog configuration'}</caption>
 
-	                    {module_include location='catalog_configuration_top'}
+		                    {module_include location='catalog_configuration_top'}
 
-                        {loop type="auth" name="pcc1" roles="ADMIN" permissions="admin.configuration.templates"}
-		                <tr>
-		                    <td><a href="{url path='/admin/configuration/templates'}">{intl l='Product templates'}</a></td>
-		                    <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/templates'}"><i class="glyphicon glyphicon-edit"></i></a></td>
-		                </tr>
-		                {/loop}
+	                        {loop type="auth" name="pcc1" roles="ADMIN" permissions="admin.configuration.templates"}
+			                <tr>
+			                    <td><a href="{url path='/admin/configuration/templates'}">{intl l='Product templates'}</a></td>
+			                    <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/templates'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+			                </tr>
+			                {/loop}
 
-                        {loop type="auth" name="pcc2" roles="ADMIN" permissions="admin.configuration.attributes"}
-	                    <tr>
-	                        <td><a href="{url path='/admin/configuration/attributes'}">{intl l='Product attributes'}</a></td>
-	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/attributes'}"><i class="glyphicon glyphicon-edit"></i></a></td>
-	                    </tr>
-                        {/loop}
+	                        {loop type="auth" name="pcc2" roles="ADMIN" permissions="admin.configuration.attributes"}
+		                    <tr>
+		                        <td><a href="{url path='/admin/configuration/attributes'}">{intl l='Product attributes'}</a></td>
+		                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/attributes'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+		                    </tr>
+	                        {/loop}
 
-                        {loop type="auth" name="pcc3" roles="ADMIN" permissions="admin.configuration.features"}
-	                    <tr>
-	                        <td><a href="{url path='/admin/configuration/features'}">{intl l='Product features'}</a></td>
-	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/features'}"><i class="glyphicon glyphicon-edit"></i></a></td>
-	                    </tr>
-                        {/loop}
+	                        {loop type="auth" name="pcc3" roles="ADMIN" permissions="admin.configuration.features"}
+		                    <tr>
+		                        <td><a href="{url path='/admin/configuration/features'}">{intl l='Product features'}</a></td>
+		                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/features'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+		                    </tr>
+	                        {/loop}
 
-                        {loop type="auth" name="pcc4" roles="ADMIN" permissions="admin.configuration.messages"}
-	                    <tr>
-	                        <td><a href="{url path='/admin/configuration/messages'}">{intl l='Mailing templates'}</a></td>
-	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/messages'}"><i class="glyphicon glyphicon-edit"></i></a></td>
-	                    </tr>
-                        {/loop}
+	                        {loop type="auth" name="pcc4" roles="ADMIN" permissions="admin.configuration.messages"}
+		                    <tr>
+		                        <td><a href="{url path='/admin/configuration/messages'}">{intl l='Mailing templates'}</a></td>
+		                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/messages'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+		                    </tr>
+	                        {/loop}
 
-                        {loop type="auth" name="pcc5" roles="ADMIN" permissions="admin.configuration.currencies"}
-	                    <tr>
-	                        <td><a href="{url path='/admin/configuration/currencies'}">{intl l='Currencies'}</a></td>
-	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/currencies'}"><i class="glyphicon glyphicon-edit"></i></a></td>
-	                    </tr>
-                        {/loop}
+	                        {loop type="auth" name="pcc5" roles="ADMIN" permissions="admin.configuration.currencies"}
+		                    <tr>
+		                        <td><a href="{url path='/admin/configuration/currencies'}">{intl l='Currencies'}</a></td>
+		                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/currencies'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+		                    </tr>
+	                        {/loop}
 
-	                    {module_include location='catalog_configuration_bottom'}
-
-		            </table>
+		                    {module_include location='catalog_configuration_bottom'}
+			            </table>
+			        </div>
 	            </div>
 	        </div>
 
 	        <div class="col-md-4">
 	            <div class="menu-list-table general-block-decorator">
-	                <table class="table table-striped table-condensed">
-	                    <caption>{intl l='Shipping configuration'}</caption>
+	            	<div class="table-responsive">
+		                <table class="table table-striped table-condensed">
+		                    <caption>{intl l='Shipping configuration'}</caption>
 
-	                    {module_include location='shipping_configuration_top'}
+		                    {module_include location='shipping_configuration_top'}
 
-                        {loop type="auth" name="pcc1" roles="ADMIN" permissions="admin.configuration.contries"}
-	                    <tr>
-	                        <td><a href="{url path='/admin/configuration/countries'}">{intl l='Countries'}</a></td>
-	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/countries'}"><i class="glyphicon glyphicon-edit"></i></a></td>
-	                    </tr>
-                        {/loop}
+	                        {loop type="auth" name="pcc1" roles="ADMIN" permissions="admin.configuration.contries"}
+		                    <tr>
+		                        <td><a href="{url path='/admin/configuration/countries'}">{intl l='Countries'}</a></td>
+		                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/countries'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+		                    </tr>
+	                        {/loop}
 
-                        {loop type="auth" name="pcc2" roles="ADMIN" permissions="admin.configuration.shipping_zones"}
-	                    <tr>
-	                        <td><a href="{url path='/admin/configuration/shipping_zones'}">{intl l='Shipping zones'}</a></td>
-	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/shipping_zones'}"><i class="glyphicon glyphicon-edit"></i></a></td>
-	                    </tr>
-                        {/loop}
+	                        {loop type="auth" name="pcc2" roles="ADMIN" permissions="admin.configuration.shipping_zones"}
+		                    <tr>
+		                        <td><a href="{url path='/admin/configuration/shipping_zones'}">{intl l='Shipping zones'}</a></td>
+		                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/shipping_zones'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+		                    </tr>
+	                        {/loop}
 
-                        {loop type="auth" name="pcc3" roles="ADMIN" permissions="admin.configuration.shipping_configuration"}
-	                    <tr>
-	                        <td><a href="{url path='/admin/configuration/shipping_configuration'}">{intl l='Shipping configuration'}</a></td>
-	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/shipping_configuration'}"><i class="glyphicon glyphicon-edit"></i></a></td>
-	                    </tr>
-                        {/loop}
+	                        {loop type="auth" name="pcc3" roles="ADMIN" permissions="admin.configuration.shipping_configuration"}
+		                    <tr>
+		                        <td><a href="{url path='/admin/configuration/shipping_configuration'}">{intl l='Shipping configuration'}</a></td>
+		                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/shipping_configuration'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+		                    </tr>
+	                        {/loop}
 
-	                    {module_include location='shipping_configuration_bottom'}
+		                    {module_include location='shipping_configuration_bottom'}
 
-	                </table>
+		                </table>
+		            </div>
 	            </div>
 	        </div>
 
 	        <div class="col-md-4">
 	            <div class="menu-list-table general-block-decorator">
-	                <table class="table table-striped table-condensed">
-	                    <caption>{intl l='System parameters'}</caption>
+	            	<div class="table-responsive">
+		                <table class="table table-striped table-condensed">
+		                    <caption>{intl l='System parameters'}</caption>
 
-	                    {module_include location='system_configuration_top'}
+		                    {module_include location='system_configuration_top'}
 
-                        {loop type="auth" name="pcc1" roles="ADMIN" permissions="admin.configuration.modules"}
-	                    <tr>
-	                        <td><a href="{url path='/admin/configuration/modules'}">{intl l='Modules activation'}</a></td>
-	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/modules'}"><i class="glyphicon glyphicon-edit"></i></a></td>
-	                    </tr>
-                        {/loop}
+	                        {loop type="auth" name="pcc1" roles="ADMIN" permissions="admin.configuration.modules"}
+		                    <tr>
+		                        <td><a href="{url path='/admin/configuration/modules'}">{intl l='Modules activation'}</a></td>
+		                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/modules'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+		                    </tr>
+	                        {/loop}
 
-                        {loop type="auth" name="pcc2" roles="ADMIN" permissions="admin.configuration.variables"}
-	                    <tr>
-	                        <td><a href="{url path='/admin/configuration/variables'}">{intl l='System variables'}</a></td>
-	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/variables'}"><i class="glyphicon glyphicon-edit"></i></a></td>
-	                    </tr>
-                        {/loop}
+	                        {loop type="auth" name="pcc2" roles="ADMIN" permissions="admin.configuration.variables"}
+		                    <tr>
+		                        <td><a href="{url path='/admin/configuration/variables'}">{intl l='System variables'}</a></td>
+		                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/variables'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+		                    </tr>
+	                        {/loop}
 
-                        {loop type="auth" name="pcc3" roles="ADMIN" permissions="admin.configuration.admin_profiles"}
-	                    <tr>
-	                        <td><a href="{url path='/admin/configuration/admin_profiles'}">{intl l='Back-office profiles'}</a></td>
-	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/admin_profiles'}"><i class="glyphicon glyphicon-edit"></i></a></td>
-	                    </tr>
-                        {/loop}
+	                        {loop type="auth" name="pcc3" roles="ADMIN" permissions="admin.configuration.admin_profiles"}
+		                    <tr>
+		                        <td><a href="{url path='/admin/configuration/admin_profiles'}">{intl l='Back-office profiles'}</a></td>
+		                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/admin_profiles'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+		                    </tr>
+	                        {/loop}
 
-                        {loop type="auth" name="pcc4" roles="ADMIN" permissions="admin.configuration.admin_users"}
-	                    <tr>
-	                        <td><a href="{url path='/admin/configuration/admin_users'}">{intl l='Back-office users'}</a></td>
-	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/admin_users'}"><i class="glyphicon glyphicon-edit"></i></a></td>
-	                    </tr>
-                        {/loop}
+	                        {loop type="auth" name="pcc4" roles="ADMIN" permissions="admin.configuration.admin_users"}
+		                    <tr>
+		                        <td><a href="{url path='/admin/configuration/admin_users'}">{intl l='Back-office users'}</a></td>
+		                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/admin_users'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+		                    </tr>
+	                        {/loop}
 
-                        {loop type="auth" name="pcc5" roles="ADMIN" permissions="admin.configuration.languages"}
-	                    <tr>
-	                        <td><a href="{url path='/admin/configuration/languages'}">{intl l='Languages &amp; URLs'}</a></td>
-	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/languages'}"><i class="glyphicon glyphicon-edit"></i></a></td>
-	                    </tr>
-                        {/loop}
+	                        {loop type="auth" name="pcc5" roles="ADMIN" permissions="admin.configuration.languages"}
+		                    <tr>
+		                        <td><a href="{url path='/admin/configuration/languages'}">{intl l='Languages &amp; URLs'}</a></td>
+		                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/languages'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+		                    </tr>
+	                        {/loop}
 
-                        {loop type="auth" name="pcc6" roles="ADMIN" permissions="admin.configuration.mailing_system"}
-	                    <tr>
-	                        <td><a href="{url path='/admin/configuration/mailing_system'}">{intl l='Mailing system'}</a></td>
-	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/mailing_system'}"><i class="glyphicon glyphicon-edit"></i></a></td>
-	                    </tr>
-                        {/loop}
+	                        {loop type="auth" name="pcc6" roles="ADMIN" permissions="admin.configuration.mailing_system"}
+		                    <tr>
+		                        <td><a href="{url path='/admin/configuration/mailing_system'}">{intl l='Mailing system'}</a></td>
+		                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/mailing_system'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+		                    </tr>
+	                        {/loop}
 
-                        {loop type="auth" name="pcc7" roles="ADMIN" permissions="admin.configuration.admin_logs"}
-	                    <tr>
-	                        <td><a href="{url path='/admin/configuration/admin_logs'}">{intl l='Administration logs'}</a></td>
-	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/admin_logs'}"><i class="glyphicon glyphicon-edit"></i></a></td>
-	                    </tr>
-                        {/loop}
+	                        {loop type="auth" name="pcc7" roles="ADMIN" permissions="admin.configuration.admin_logs"}
+		                    <tr>
+		                        <td><a href="{url path='/admin/configuration/admin_logs'}">{intl l='Administration logs'}</a></td>
+		                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/admin_logs'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+		                    </tr>
+	                        {/loop}
 
-                        {loop type="auth" name="pcc8" roles="ADMIN" permissions="admin.configuration.system_logs"}
-	                    <tr>
-	                        <td><a href="{url path='/admin/configuration/system_logs'}">{intl l='System logs'}</a></td>
-	                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/system_logs'}"><i class="glyphicon glyphicon-edit"></i></a></td>
-	                    </tr>
-                        {/loop}
+	                        {loop type="auth" name="pcc8" roles="ADMIN" permissions="admin.configuration.system_logs"}
+		                    <tr>
+		                        <td><a href="{url path='/admin/configuration/system_logs'}">{intl l='System logs'}</a></td>
+		                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/system_logs'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+		                    </tr>
+	                        {/loop}
 
-	                    {module_include location='system_configuration_bottom'}
-	                </table>
+		                    {module_include location='system_configuration_bottom'}
+		                </table>
+		            </div>
 	            </div>
 	        </div>
 
diff --git a/templates/admin/default/countries.html b/templates/admin/default/countries.html
index 982db557f..fe1b614a1 100644
--- a/templates/admin/default/countries.html
+++ b/templates/admin/default/countries.html
@@ -23,80 +23,80 @@
                     <form action="" method="post">
 
                         <div class="general-block-decorator">
-
-                            <table class="table table-striped table-condensed">
-                               <caption class="clearfix">
-                                    {intl l='Countries'}
-                                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.countries.create"}
-                                        <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new country'}" href="#add_country_dialog" data-toggle="modal">
-                                            <span class="glyphicon glyphicon-plus-sign"></span>
-                                        </a>
-                                    {/loop}
-                                </caption>
-                                <thead>
-                                    <tr>
-                                        <th>ID</th>
-                                        <th>Name</th>
-                                        <th>Default</th>
-                                        <th>Shop</th>
-                                        <th>N° ISO</th>
-                                        <th>ISO Code</th>
-
-                                        {module_include location='countries_table_header'}
-
-                                        <th class="actions">{intl l='Actions'}</th>
-                                    </tr>
-                                </thead>
-
-                                <tbody>
-                                    {loop name="countries" type="country" backend_context="1" lang=$lang_id order=$order}
+                            <div class="table-responsive">
+                                <table class="table table-striped table-condensed">
+                                   <caption class="clearfix">
+                                        {intl l='Countries'}
+                                        {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.countries.create"}
+                                            <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new country'}" href="#add_country_dialog" data-toggle="modal">
+                                                <span class="glyphicon glyphicon-plus-sign"></span>
+                                            </a>
+                                        {/loop}
+                                    </caption>
+                                    <thead>
                                         <tr>
-                                            <td>{$ID}</td>
-                                            <td>{$TITLE}</td>                                            
-                                            <td>
-                                                <div class="make-switch switch-small switch-radio" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
-                                                    <input class="change-default" type="radio" name="" value="{$ID}" {if $IS_DEFAULT}selected="selected"{/if}/>
-                                                </div>
-                                            </td>
-                                            <td>                                                
-                                                <div class="make-switch switch-small switch-radio" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
-                                                    <input class="change-default" type="radio" name="" value="{$ID}" {if $IS_DEFAULT}selected="selected"{/if}/>
-                                                </div>                                                
-                                            </td>                                            
-                                            <td>{$ISOCODE}</td>
-                                            <td>{$ISOALPHA3}</td>
+                                            <th>ID</th>
+                                            <th>Name</th>
+                                            <th>Default</th>
+                                            <th>Shop</th>
+                                            <th>N° ISO</th>
+                                            <th>ISO Code</th>
 
-                                            {module_include location='countries_table_row'}
+                                            {module_include location='countries_table_header'}
 
-                                            <td class="actions">
-                                                <div class="btn-group">
-                                                    {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.countries.change"}
-                                                        <a class="btn btn-default btn-xs country-change" title="{intl l='Change this country'}" href="{url path="/admin/configuration/countries/update/{$ID}"}">
-                                                            <span class="glyphicon glyphicon-edit"></span>
-                                                        </a>
-                                                    {/loop}
-
-                                                    {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.countries.delete"}
-                                                        <a class="btn btn-default btn-xs country-delete" title="{intl l='Delete this country'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal">
-                                                            <span class="glyphicon glyphicon-trash"></span>
-                                                        </a>
-                                                    {/loop}
-                                                </div>
-                                            </td>
+                                            <th class="actions">{intl l='Actions'}</th>
                                         </tr>
-                                    {/loop}
-                                    {elseloop rel="countries"}
-                                        <tr>
-                                            <td colspan="8">
-                                                <div class="alert alert-info">
-                                                    {intl l="No country has been created yet. Click the + button to create one."}
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    {/elseloop}
-                                </tbody>
-                            </table>
+                                    </thead>
 
+                                    <tbody>
+                                        {loop name="countries" type="country" backend_context="1" lang=$lang_id order=$order}
+                                            <tr>
+                                                <td>{$ID}</td>
+                                                <td>{$TITLE}</td>                                            
+                                                <td>
+                                                    <div class="make-switch switch-small switch-radio" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                                        <input class="change-default" type="radio" name="" value="{$ID}" {if $IS_DEFAULT}selected="selected"{/if}/>
+                                                    </div>
+                                                </td>
+                                                <td>                                                
+                                                    <div class="make-switch switch-small switch-radio" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                                        <input class="change-default" type="radio" name="" value="{$ID}" {if $IS_DEFAULT}selected="selected"{/if}/>
+                                                    </div>                                                
+                                                </td>                                            
+                                                <td>{$ISOCODE}</td>
+                                                <td>{$ISOALPHA3}</td>
+
+                                                {module_include location='countries_table_row'}
+
+                                                <td class="actions">
+                                                    <div class="btn-group">
+                                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.countries.change"}
+                                                            <a class="btn btn-default btn-xs country-change" title="{intl l='Change this country'}" href="{url path="/admin/configuration/countries/update/{$ID}"}">
+                                                                <span class="glyphicon glyphicon-edit"></span>
+                                                            </a>
+                                                        {/loop}
+
+                                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.countries.delete"}
+                                                            <a class="btn btn-default btn-xs country-delete" title="{intl l='Delete this country'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal">
+                                                                <span class="glyphicon glyphicon-trash"></span>
+                                                            </a>
+                                                        {/loop}
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        {/loop}
+                                        {elseloop rel="countries"}
+                                            <tr>
+                                                <td colspan="8">
+                                                    <div class="alert alert-info">
+                                                        {intl l="No country has been created yet. Click the + button to create one."}
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        {/elseloop}
+                                    </tbody>
+                                </table>
+                            </div>
                         </div>
 
                     </form>
diff --git a/templates/admin/default/coupon-list.html b/templates/admin/default/coupon-list.html
index 2eafde586..3abc9268d 100755
--- a/templates/admin/default/coupon-list.html
+++ b/templates/admin/default/coupon-list.html
@@ -22,73 +22,77 @@
 
     <section class="row">
 		<div class="col-md-12 general-block-decorator">
-	    	<table class="table table-striped tablesorter">
-	    		<caption>
-                    {intl l='Enabled coupons'}
-	    		</caption>
-	    		<thead>
-	    			<tr>
-	    				<th>{block name="coupon-label-code"}{intl l='Code'}{/block}</th>
-	    				<th>{block name="coupon-label-title"}{intl l='Title'}{/block}</th>
-	    				<th>{block name="coupon-label-expiration-date"}{intl l='Expiration date'}{/block}</th>
-	    				<th>{block name="coupon-label-usage-left"}{intl l='Usage left'}{/block}</th>
-	    				<th class="sorter-false filter-false">{block name="coupon-label-action"}{/block}</th>
-	    			</tr>
-	    		</thead>
-	    		<tbody>
-                    {loop type="coupon" name="list_coupon" is_enabled="1" backend_context="true"}
-                        <tr>
-                            <td>{block name="coupon-code"}<a href="{$urlReadCoupon|replace:'couponId':$ID}">{$CODE}</a>{/block}</td>
-                            <td>{block name="coupon-title"}{$TITLE}{/block}</td>
-                            <td>{block name="coupon-expiration-date"}{$EXPIRATION_DATE}{/block}</td>
-                            <td>{block name="coupon-usage-left"}{$USAGE_LEFT}{/block}</td>
-                            <td>
-                                {block name="coupon-action"}
-                                    <a href="{$urlEditCoupon|replace:'couponId':$ID}" class="btn btn-default btn-primary btn-medium">
-                                        <span class="glyphicon glyphicon-edit"></span> {intl l='Edit'}
-                                    </a>
-                                {/block}
-                            </td>
-                        </tr>
-                    {/loop}
-	    		</tbody>
-	    	</table>
+            <div class="table-responsive">
+    	    	<table class="table table-striped tablesorter">
+    	    		<caption>
+                        {intl l='Enabled coupons'}
+    	    		</caption>
+    	    		<thead>
+    	    			<tr>
+    	    				<th>{block name="coupon-label-code"}{intl l='Code'}{/block}</th>
+    	    				<th>{block name="coupon-label-title"}{intl l='Title'}{/block}</th>
+    	    				<th>{block name="coupon-label-expiration-date"}{intl l='Expiration date'}{/block}</th>
+    	    				<th>{block name="coupon-label-usage-left"}{intl l='Usage left'}{/block}</th>
+    	    				<th class="sorter-false filter-false">{block name="coupon-label-action"}{/block}</th>
+    	    			</tr>
+    	    		</thead>
+    	    		<tbody>
+                        {loop type="coupon" name="list_coupon" is_enabled="1" backend_context="true"}
+                            <tr>
+                                <td>{block name="coupon-code"}<a href="{$urlReadCoupon|replace:'couponId':$ID}">{$CODE}</a>{/block}</td>
+                                <td>{block name="coupon-title"}{$TITLE}{/block}</td>
+                                <td>{block name="coupon-expiration-date"}{$EXPIRATION_DATE}{/block}</td>
+                                <td>{block name="coupon-usage-left"}{$USAGE_LEFT}{/block}</td>
+                                <td>
+                                    {block name="coupon-action"}
+                                        <a href="{$urlEditCoupon|replace:'couponId':$ID}" class="btn btn-default btn-primary btn-medium">
+                                            <span class="glyphicon glyphicon-edit"></span> {intl l='Edit'}
+                                        </a>
+                                    {/block}
+                                </td>
+                            </tr>
+                        {/loop}
+    	    		</tbody>
+    	    	</table>
+            </div>
 		</div>
     </section>
 
     <section class="row">
 		<div class="col-md-12 general-block-decorator">
-	    	<table class="table table-striped tablesorter">
-	    		<caption>
-                    {intl l='Disabled coupons'}
-	    		</caption>
-	    		<thead>
-	    			<tr>
-                        <th>{block name="coupon-label-code"}{intl l='Code'}{/block}</th>
-                        <th>{block name="coupon-label-title"}{intl l='Title'}{/block}</th>
-                        <th>{block name="coupon-label-expiration-date"}{intl l='Expiration date'}{/block}</th>
-                        <th>{block name="coupon-label-usage-left"}{intl l='Usage left'}{/block}</th>
-                        <th class="sorter-false filter-false">{block name="coupon-label-action"}{/block}</th>
-	    			</tr>
-	    		</thead>
-	    		<tbody>
-                    {loop type="coupon" name="list_coupon" is_enabled="0" backend_context="true"}
-                        <tr>
-                            <td>{block name="coupon-code"}<a href="{$urlReadCoupon|replace:'couponId':$ID}">{$CODE}</a>{/block}</td>
-                            <td>{block name="coupon-title"}{$TITLE}{/block}</td>
-                            <td>{block name="coupon-expiration-date"}{$EXPIRATION_DATE}{/block}</td>
-                            <td>{block name="coupon-usage-left"}{$USAGE_LEFT}{/block}</td>
-                            <td>
-                                {block name="coupon-action"}
-                                <a href="{$urlEditCoupon|replace:'couponId':$ID}" class="btn btn-default btn-primary btn-medium">
-                                    <span class="glyphicon glyphicon-edit"></span> {intl l='Edit'}
-                                </a>
-                                {/block}
-                            </td>
-                        </tr>
-                    {/loop}
-	    		</tbody>
-	    	</table>
+            <div class="table-responsive">
+    	    	<table class="table table-striped tablesorter">
+    	    		<caption>
+                        {intl l='Disabled coupons'}
+    	    		</caption>
+    	    		<thead>
+    	    			<tr>
+                            <th>{block name="coupon-label-code"}{intl l='Code'}{/block}</th>
+                            <th>{block name="coupon-label-title"}{intl l='Title'}{/block}</th>
+                            <th>{block name="coupon-label-expiration-date"}{intl l='Expiration date'}{/block}</th>
+                            <th>{block name="coupon-label-usage-left"}{intl l='Usage left'}{/block}</th>
+                            <th class="sorter-false filter-false">{block name="coupon-label-action"}{/block}</th>
+    	    			</tr>
+    	    		</thead>
+    	    		<tbody>
+                        {loop type="coupon" name="list_coupon" is_enabled="0" backend_context="true"}
+                            <tr>
+                                <td>{block name="coupon-code"}<a href="{$urlReadCoupon|replace:'couponId':$ID}">{$CODE}</a>{/block}</td>
+                                <td>{block name="coupon-title"}{$TITLE}{/block}</td>
+                                <td>{block name="coupon-expiration-date"}{$EXPIRATION_DATE}{/block}</td>
+                                <td>{block name="coupon-usage-left"}{$USAGE_LEFT}{/block}</td>
+                                <td>
+                                    {block name="coupon-action"}
+                                    <a href="{$urlEditCoupon|replace:'couponId':$ID}" class="btn btn-default btn-primary btn-medium">
+                                        <span class="glyphicon glyphicon-edit"></span> {intl l='Edit'}
+                                    </a>
+                                    {/block}
+                                </td>
+                            </tr>
+                        {/loop}
+    	    		</tbody>
+    	    	</table>
+            </div>
 		</div>
     </section>
 
diff --git a/templates/admin/default/coupon-read.html b/templates/admin/default/coupon-read.html
index 4ae5e5c68..8f14dd44f 100755
--- a/templates/admin/default/coupon-read.html
+++ b/templates/admin/default/coupon-read.html
@@ -27,120 +27,122 @@
                             {intl l='This coupon is disabled, you can enable to the bottom of this form.'}
                         </div>
                     {/if}
-
-                    <table class="table table-striped">
-                        <tbody>
-                        <tr>
-                            <td>{intl l='Title'}</td>
-                            <td>{$TITLE}</td>
-                        </tr>
-                        <tr>
-                            <td colspan="2">
-                                {if $IS_ENABLED}
-                                    <span class="label label-success">
-                                        {intl l="Is enabled"}
-                                    </span>
-                                {else}
-                                    <span class="label label-warning">
-                                        {intl l="Is disabled"}
-                                    </span>
-                                {/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2">
-                                {$TOOLTIP}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>{intl l='Amount'}</td>
-                            <td>{$AMOUNT}</td>
-                        </tr>
-                        <tr>
-                            <td>{intl l='Expiration date'}</td>
-                            <td>{$EXPIRATION_DATE} ({$DAY_LEFT_BEFORE_EXPIRATION} {intl l="days left"})</td>
-                        </tr>
-                        <tr>
-                            <td>{intl l='Usage left'}</td>
-                            <td>
-                                {if $USAGE_LEFT}
-                                    <span class="label label-success">
-                                        {$USAGE_LEFT}
-                                    </span>
-                                {else}
-                                    <span class="label label-warning">
-                                        0
-                                    </span>
-                                {/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2">
-                                {if $IS_CUMULATIVE}
-                                    <span class="label label-success">
-                                        {intl l="May be cumulative"}
-                                    </span>
-                                {else}
-                                    <span class="label label-warning">
-                                        {intl l="Can't be cumulative"}
-                                    </span>
-                                {/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2">
-                                {if $IS_REMOVING_POSTAGE}
-                                    <span class="label label-warning">
-                                        {intl l="Will remove postage"}
-                                    </span>
-                                {else}
-                                    <span class="label label-success">
-                                        {intl l="Won't remove postage"}
-                                    </span>
-                                {/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2">
-                                {if $IS_AVAILABLE_ON_SPECIAL_OFFERS}
-                                    <span class="label label-warning">
-                                        {intl l="Will be available on special offers"}
-                                    </span>
-                                {else}
-                                    <span class="label label-success">
-                                        {intl l="Won't be available on special offers"}
-                                    </span>
-                                {/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>{intl l='Application field'}</td>
-                            <td>
-                                <ul class="list-unstyled">
-                                    {foreach from=$APPLICATION_CONDITIONS item=rule name=rulesForeach}
-                                        {if !$smarty.foreach.rulesForeach.first}
-                                            <li><span class="label label-info">{intl l='And'}</span></li>
-                                        {/if}
-                                        <li>{$rule nofilter}</li>
-                                    {/foreach}
-                                </ul>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2">{$SHORT_DESCRIPTION}</td>
-                        </tr>
-                        <tr>
-                            <td colspan="2">{$DESCRIPTION}</td>
-                        </tr>
-                        <tr>
-                            <td colspan="2">
-                                <a href="{$urlEditCoupon}" class="btn btn-default btn-primary btn-medium">
-                                <span class="icon-edit icon-white"></span> {intl l='Edit'}
-                                </a>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
+                    
+                    <div class="table-responsive">
+                        <table class="table table-striped">
+                            <tbody>
+                            <tr>
+                                <td>{intl l='Title'}</td>
+                                <td>{$TITLE}</td>
+                            </tr>
+                            <tr>
+                                <td colspan="2">
+                                    {if $IS_ENABLED}
+                                        <span class="label label-success">
+                                            {intl l="Is enabled"}
+                                        </span>
+                                    {else}
+                                        <span class="label label-warning">
+                                            {intl l="Is disabled"}
+                                        </span>
+                                    {/if}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="2">
+                                    {$TOOLTIP}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>{intl l='Amount'}</td>
+                                <td>{$AMOUNT}</td>
+                            </tr>
+                            <tr>
+                                <td>{intl l='Expiration date'}</td>
+                                <td>{$EXPIRATION_DATE} ({$DAY_LEFT_BEFORE_EXPIRATION} {intl l="days left"})</td>
+                            </tr>
+                            <tr>
+                                <td>{intl l='Usage left'}</td>
+                                <td>
+                                    {if $USAGE_LEFT}
+                                        <span class="label label-success">
+                                            {$USAGE_LEFT}
+                                        </span>
+                                    {else}
+                                        <span class="label label-warning">
+                                            0
+                                        </span>
+                                    {/if}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="2">
+                                    {if $IS_CUMULATIVE}
+                                        <span class="label label-success">
+                                            {intl l="May be cumulative"}
+                                        </span>
+                                    {else}
+                                        <span class="label label-warning">
+                                            {intl l="Can't be cumulative"}
+                                        </span>
+                                    {/if}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="2">
+                                    {if $IS_REMOVING_POSTAGE}
+                                        <span class="label label-warning">
+                                            {intl l="Will remove postage"}
+                                        </span>
+                                    {else}
+                                        <span class="label label-success">
+                                            {intl l="Won't remove postage"}
+                                        </span>
+                                    {/if}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="2">
+                                    {if $IS_AVAILABLE_ON_SPECIAL_OFFERS}
+                                        <span class="label label-warning">
+                                            {intl l="Will be available on special offers"}
+                                        </span>
+                                    {else}
+                                        <span class="label label-success">
+                                            {intl l="Won't be available on special offers"}
+                                        </span>
+                                    {/if}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>{intl l='Application field'}</td>
+                                <td>
+                                    <ul class="list-unstyled">
+                                        {foreach from=$APPLICATION_CONDITIONS item=rule name=rulesForeach}
+                                            {if !$smarty.foreach.rulesForeach.first}
+                                                <li><span class="label label-info">{intl l='And'}</span></li>
+                                            {/if}
+                                            <li>{$rule nofilter}</li>
+                                        {/foreach}
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="2">{$SHORT_DESCRIPTION}</td>
+                            </tr>
+                            <tr>
+                                <td colspan="2">{$DESCRIPTION}</td>
+                            </tr>
+                            <tr>
+                                <td colspan="2">
+                                    <a href="{$urlEditCoupon}" class="btn btn-default btn-primary btn-medium">
+                                    <span class="icon-edit icon-white"></span> {intl l='Edit'}
+                                    </a>
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
             </section>
         {/loop}
diff --git a/templates/admin/default/currencies.html b/templates/admin/default/currencies.html
index fe4cfe882..11b52cd24 100644
--- a/templates/admin/default/currencies.html
+++ b/templates/admin/default/currencies.html
@@ -23,166 +23,166 @@
                     <form action="{url path='/admin/configuration/currencies/update-rates'}" method="post">
 
                         <div class="general-block-decorator">
-
-                            <table class="table table-striped table-condensed">
-                               <caption class="clearfix">
-                                    {intl l='Currencies'}
-                                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.currencies.create"}
-                                        <span class="pull-right">
-                                            <button class="btn btn-default btn-info" title="{intl l='Update rates'}">{intl l='Update rates'} <span class="glyphicon glyphicon-globe"></span></button>
-                                            <a class="btn btn-default btn-primary" title="{intl l='Add a new currency'}" href="#creation_dialog" data-toggle="modal">
-                                                <span class="glyphicon glyphicon-plus-sign"></span>
-                                            </a>
-                                        </span>
-                                    {/loop}
-                                </caption>
-                                <thead>
-                                    <tr>
-                                        <th>
-                                            {admin_sortable_header
-                                            current_order=$order
-                                            order='id'
-                                            reverse_order='id_reverse'
-                                            path='/admin/configuration/currencies'
-                                            label="{intl l='ID'}"
-                                            }
-                                        </th>
-
-                                        <th>
-                                            {admin_sortable_header
-                                            current_order=$order
-                                            order='name'
-                                            reverse_order='name_reverse'
-                                            path='/admin/configuration/currencies'
-                                            label="{intl l='Name'}"
-                                            }
-                                        </th>
-
-                                        <th class="text-center">
-                                            {admin_sortable_header
-                                            current_order=$order
-                                            order='code'
-                                            reverse_order='code_reverse'
-                                            path='/admin/configuration/currencies'
-                                            label="{intl l="ISO 4217 Code"}"
-                                            }
-                                            <a title="{intl l='More information about ISO 4217'}" href="http://fr.wikipedia.org/wiki/ISO_4217" target="_blank"><i class="glyphicon glyphicon-question-sign"></i></a>
-                                        </th>
-
-                                        <th class="text-center">
-                                            {admin_sortable_header
-                                            current_order=$order
-                                            order='symbol'
-                                            reverse_order='symbol_reverse'
-                                            path='/admin/configuration/currencies'
-                                            label="{intl l="Symbol"}"
-                                            }
-                                        </th>
-
-                                        <th class="text-right">
-                                            {admin_sortable_header
-                                            current_order=$order
-                                            order='rate'
-                                            reverse_order='rate_reverse'
-                                            path='/admin/configuration/currencies'
-                                            label="{intl l="Rate in &euro;"}"
-                                            }
-                                        </th>
-
-                                        <th class="text-center">
-                                            {admin_sortable_header
-                                            current_order=$order
-                                            order='manual'
-                                            reverse_order='manual_reverse'
-                                            path='/admin/configuration/currencies'
-                                            label="{intl l="Position"}"
-                                            }
-                                        </th>
-
-                                        <th class="text-center">
-                                            {admin_sortable_header
-                                            current_order=$order
-                                            order='is_default'
-                                            reverse_order='is_default_reverse'
-                                            path='/admin/configuration/currencies'
-                                            label="{intl l="Default"}"
-                                            }
-                                        </th>
-
-                                        {module_include location='currencies_table_header'}
-
-                                        <th class="actions">{intl l='Actions'}</th>
-                                    </tr>
-                                </thead>
-
-                                <tbody>
-                                    {loop name="currencies" type="currency" backend_context="1" lang=$lang_id order=$order}
+                            <div class="table-responsive">
+                                <table class="table table-striped table-condensed">
+                                   <caption class="clearfix">
+                                        {intl l='Currencies'}
+                                        {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.currencies.create"}
+                                            <span class="pull-right">
+                                                <button class="btn btn-default btn-info" title="{intl l='Update rates'}">{intl l='Update rates'} <span class="glyphicon glyphicon-globe"></span></button>
+                                                <a class="btn btn-default btn-primary" title="{intl l='Add a new currency'}" href="#creation_dialog" data-toggle="modal">
+                                                    <span class="glyphicon glyphicon-plus-sign"></span>
+                                                </a>
+                                            </span>
+                                        {/loop}
+                                    </caption>
+                                    <thead>
                                         <tr>
-                                            <td>{$ID}</td>
-
-                                            <td>
-                                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.currencies.change"}
-                                                    <a title="{intl l='Change this currency'}" href="{url path='/admin/configuration/currencies/update' currency_id=$ID}">{$NAME}</a>
-                                                {/loop}
-                                                {elseloop rel="can_change"}
-                                                    {$NAME}
-                                                {/elseloop}
-                                            </td>
-
-                                            <td class="text-center">{$ISOCODE}</td>
-
-                                            <td class="text-center">{$SYMBOL}</td>
-
-                                            <td class="text-right">{format_number number="$RATE" decimals="4"}</td>
-
-                                            <td class="text-center">
-                                                {admin_position_block
-                                                permission="admin.currencies.edit"
-                                                path="/admin/configuration/currencies/update-position"
-                                                url_parameter="currency_id"
-                                                in_place_edit_class="currencyPositionChange"
-                                                position="$POSITION"
-                                                id="$ID"
+                                            <th>
+                                                {admin_sortable_header
+                                                current_order=$order
+                                                order='id'
+                                                reverse_order='id_reverse'
+                                                path='/admin/configuration/currencies'
+                                                label="{intl l='ID'}"
                                                 }
-                                            </td>
+                                            </th>
 
-                                            <td class="text-center">
-                                                <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
-                                                    <input class="change-default" type="radio" name="is_default" value="{$ID}" {if $IS_DEFAULT}checked="checked"{/if}/>
-                                                </div>
-                                            </td>
+                                            <th>
+                                                {admin_sortable_header
+                                                current_order=$order
+                                                order='name'
+                                                reverse_order='name_reverse'
+                                                path='/admin/configuration/currencies'
+                                                label="{intl l='Name'}"
+                                                }
+                                            </th>
 
-                                            {module_include location='currencies_table_row'}
+                                            <th class="text-center">
+                                                {admin_sortable_header
+                                                current_order=$order
+                                                order='code'
+                                                reverse_order='code_reverse'
+                                                path='/admin/configuration/currencies'
+                                                label="{intl l="ISO 4217 Code"}"
+                                                }
+                                                <a title="{intl l='More information about ISO 4217'}" href="http://fr.wikipedia.org/wiki/ISO_4217" target="_blank"><i class="glyphicon glyphicon-question-sign"></i></a>
+                                            </th>
 
-                                            <td class="actions">
-                                                <div class="btn-group">
+                                            <th class="text-center">
+                                                {admin_sortable_header
+                                                current_order=$order
+                                                order='symbol'
+                                                reverse_order='symbol_reverse'
+                                                path='/admin/configuration/currencies'
+                                                label="{intl l="Symbol"}"
+                                                }
+                                            </th>
+
+                                            <th class="text-right">
+                                                {admin_sortable_header
+                                                current_order=$order
+                                                order='rate'
+                                                reverse_order='rate_reverse'
+                                                path='/admin/configuration/currencies'
+                                                label="{intl l="Rate in &euro;"}"
+                                                }
+                                            </th>
+
+                                            <th class="text-center">
+                                                {admin_sortable_header
+                                                current_order=$order
+                                                order='manual'
+                                                reverse_order='manual_reverse'
+                                                path='/admin/configuration/currencies'
+                                                label="{intl l="Position"}"
+                                                }
+                                            </th>
+
+                                            <th class="text-center">
+                                                {admin_sortable_header
+                                                current_order=$order
+                                                order='is_default'
+                                                reverse_order='is_default_reverse'
+                                                path='/admin/configuration/currencies'
+                                                label="{intl l="Default"}"
+                                                }
+                                            </th>
+
+                                            {module_include location='currencies_table_header'}
+
+                                            <th class="actions">{intl l='Actions'}</th>
+                                        </tr>
+                                    </thead>
+
+                                    <tbody>
+                                        {loop name="currencies" type="currency" backend_context="1" lang=$lang_id order=$order}
+                                            <tr>
+                                                <td>{$ID}</td>
+
+                                                <td>
                                                     {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.currencies.change"}
-                                                        <a class="btn btn-default btn-xs currency-change" title="{intl l='Change this currency'}" href="{url path='/admin/configuration/currencies/update' currency_id="$ID"}">
-                                                            <span class="glyphicon glyphicon-edit"></span>
-                                                        </a>
+                                                        <a title="{intl l='Change this currency'}" href="{url path='/admin/configuration/currencies/update' currency_id=$ID}">{$NAME}</a>
                                                     {/loop}
+                                                    {elseloop rel="can_change"}
+                                                        {$NAME}
+                                                    {/elseloop}
+                                                </td>
 
-                                                    {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.currencies.delete"}
-                                                        <a class="btn btn-default btn-xs currency-delete" title="{intl l='Delete this currency'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal">
-                                                            <span class="glyphicon glyphicon-trash"></span>
-                                                        </a>
-                                                    {/loop}
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    {/loop}
-                                    {elseloop rel="currencies"}
-                                        <tr>
-                                            <td colspan="8">
-                                                <div class="alert alert-info">
-                                                    {intl l="No currency has been created yet. Click the + button to create one."}
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    {/elseloop}
-                                </tbody>
-                            </table>
+                                                <td class="text-center">{$ISOCODE}</td>
 
+                                                <td class="text-center">{$SYMBOL}</td>
+
+                                                <td class="text-right">{format_number number="$RATE" decimals="4"}</td>
+
+                                                <td class="text-center">
+                                                    {admin_position_block
+                                                    permission="admin.currencies.edit"
+                                                    path="/admin/configuration/currencies/update-position"
+                                                    url_parameter="currency_id"
+                                                    in_place_edit_class="currencyPositionChange"
+                                                    position="$POSITION"
+                                                    id="$ID"
+                                                    }
+                                                </td>
+
+                                                <td class="text-center">
+                                                    <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                                        <input class="change-default" type="radio" name="is_default" value="{$ID}" {if $IS_DEFAULT}checked="checked"{/if}/>
+                                                    </div>
+                                                </td>
+
+                                                {module_include location='currencies_table_row'}
+
+                                                <td class="actions">
+                                                    <div class="btn-group">
+                                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.currencies.change"}
+                                                            <a class="btn btn-default btn-xs currency-change" title="{intl l='Change this currency'}" href="{url path='/admin/configuration/currencies/update' currency_id="$ID"}">
+                                                                <span class="glyphicon glyphicon-edit"></span>
+                                                            </a>
+                                                        {/loop}
+
+                                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.currencies.delete"}
+                                                            <a class="btn btn-default btn-xs currency-delete" title="{intl l='Delete this currency'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal">
+                                                                <span class="glyphicon glyphicon-trash"></span>
+                                                            </a>
+                                                        {/loop}
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        {/loop}
+                                        {elseloop rel="currencies"}
+                                            <tr>
+                                                <td colspan="8">
+                                                    <div class="alert alert-info">
+                                                        {intl l="No currency has been created yet. Click the + button to create one."}
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        {/elseloop}
+                                    </tbody>
+                                </table>
+                            </div>
                         </div>
 
                     </form>
diff --git a/templates/admin/default/customer-edit.html b/templates/admin/default/customer-edit.html
index 10f4f3abf..9bcba75b9 100644
--- a/templates/admin/default/customer-edit.html
+++ b/templates/admin/default/customer-edit.html
@@ -142,52 +142,54 @@
                                                         </a>
                                                     </span>
                                                 </p>
+                                                
+                                                <div class="table-responsive">
+                                                    <table class="table table-bordered table-striped">
+                                                        <thead>
+                                                            <tr>
+                                                                <th>{intl l="Address"}</th>
+                                                                <th>{intl l="Actions"}</th>
+                                                            </tr>
+                                                        </thead>
+                                                        <tbody>
+                                                        {loop name="address" type="address" customer="$customer_id" backend_context="1" default="0"}
+                                                            <tr>
+                                                                <td>
+                                                                    <address>
+                                                                        <strong>{loop name="address.title" type="title" id=$TITLE}{$SHORT}{/loop} {$FIRSTNAME} {$LASTNAME}</strong><br>
+                                                                        {$ADDRESS1}<br>
+                                                                        {$ADDRESS2}<br>
+                                                                        {$ADDRESS3}<br>
+                                                                        {if $PHONE}
+                                                                            <abbr title="{intl l="Phone"}">P:</abbr> {$PHONE}<br>
+                                                                        {/if}
+                                                                        {if $CELLPHONE}
+                                                                            <abbr title="{intl l="cell phone"}">P:</abbr> {$CELLPHONE}
+                                                                        {/if}
+                                                                    </address>
+                                                                </td>
+                                                                <td>
+                                                                    <div class="btn-group">
 
-                                                <table class="table table-bordered table-striped">
-                                                    <thead>
-                                                        <tr>
-                                                            <th>{intl l="Address"}</th>
-                                                            <th>{intl l="Actions"}</th>
-                                                        </tr>
-                                                    </thead>
-                                                    <tbody>
-                                                    {loop name="address" type="address" customer="$customer_id" backend_context="1" default="0"}
-                                                        <tr>
-                                                            <td>
-                                                                <address>
-                                                                    <strong>{loop name="address.title" type="title" id=$TITLE}{$SHORT}{/loop} {$FIRSTNAME} {$LASTNAME}</strong><br>
-                                                                    {$ADDRESS1}<br>
-                                                                    {$ADDRESS2}<br>
-                                                                    {$ADDRESS3}<br>
-                                                                    {if $PHONE}
-                                                                        <abbr title="{intl l="Phone"}">P:</abbr> {$PHONE}<br>
-                                                                    {/if}
-                                                                    {if $CELLPHONE}
-                                                                        <abbr title="{intl l="cell phone"}">P:</abbr> {$CELLPHONE}
-                                                                    {/if}
-                                                                </address>
-                                                            </td>
-                                                            <td>
-                                                                <div class="btn-group">
+                                                                        <a class="btn btn-default btn-xs" title="{intl l='Edit this address'}" href="#edit_address_dialog" data-toggle="modal">
+                                                                            <span class="glyphicon glyphicon-edit"></span>
+                                                                        </a>
 
-                                                                    <a class="btn btn-default btn-xs" title="{intl l='Edit this address'}" href="#edit_address_dialog" data-toggle="modal">
-                                                                        <span class="glyphicon glyphicon-edit"></span>
-                                                                    </a>
+                                                                        <a class="btn btn-default btn-xs" title="{intl l='Use this address by default'}" href="#use_address_dialog" data-toggle="modal" rel="tooltip">
+                                                                            <span class="glyphicon glyphicon-pushpin"></span>
+                                                                        </a>
 
-                                                                    <a class="btn btn-default btn-xs" title="{intl l='Use this address by default'}" href="#use_address_dialog" data-toggle="modal" rel="tooltip">
-                                                                        <span class="glyphicon glyphicon-pushpin"></span>
-                                                                    </a>
+                                                                        <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_address_dialog" data-id="{$ID}" data-toggle="modal">
+                                                                            <span class="glyphicon glyphicon-trash"></span>
+                                                                        </a>
 
-                                                                    <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_address_dialog" data-id="{$ID}" data-toggle="modal">
-                                                                        <span class="glyphicon glyphicon-trash"></span>
-                                                                    </a>
-
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    {/loop}
-                                                    </tbody>
-                                                </table>
+                                                                    </div>
+                                                                </td>
+                                                            </tr>
+                                                        {/loop}
+                                                        </tbody>
+                                                    </table>
+                                                </div>
                                             </div>
 
                                         </form>
diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html
index 6a10b7801..9d74835d7 100644
--- a/templates/admin/default/customers.html
+++ b/templates/admin/default/customers.html
@@ -22,121 +22,123 @@
             <div class="row">
                 <div class="col-md-12">
                     <div class="general-block-decorator">
-                        <table class="table table-striped table-condensed" id="customer_list">
-                            <caption>
-                                {intl l="Customers list"}
+                        <div class="table-responsive">
+                            <table class="table table-striped table-condensed" id="customer_list">
+                                <caption>
+                                    {intl l="Customers list"}
 
-                                {module_include location='customer_list_caption'}
+                                    {module_include location='customer_list_caption'}
 
-                                {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.customers.create"}
-                                    <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new Customer'}" href="#add_customer_dialog" data-toggle="modal">
-                                        <span class="glyphicon glyphicon-plus-sign"></span>
-                                    </a>
-                                {/loop}
-                            </caption>
+                                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.customers.create"}
+                                        <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new Customer'}" href="#add_customer_dialog" data-toggle="modal">
+                                            <span class="glyphicon glyphicon-plus-sign"></span>
+                                        </a>
+                                    {/loop}
+                                </caption>
 
-                            {ifloop rel="customer_list"}
-                                <thead>
-                                <tr>
-                                    <th class="object-title">
-                                        {intl l="customer ref"}
-                                    </th>
-
-                                    <th class="object-title">
-                                        {intl l="company"}
-                                    </th>
-
-                                    {module_include location='category_list_header'}
-
-                                    <th>
-                                        {intl l="firstname & lastname"}
-                                    </th>
-
-                                    <th>
-                                        {intl l="last order"}
-                                    </th>
-
-                                    <th>{intl l='order amount'}</th>
-
-                                    <th class="actions">{intl l='Actions'}</th>
-                                </tr>
-                                </thead>
-
-                                <tbody>
-                                {loop name="customer_list" type="customer" current="false" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}}
+                                {ifloop rel="customer_list"}
+                                    <thead>
                                     <tr>
-                                        <td><a href="{url path="/admin/customer/update/{$ID}" }">{$REF}</a></td>
+                                        <th class="object-title">
+                                            {intl l="customer ref"}
+                                        </th>
 
-                                        <td>
-                                            {$COMPANY}
-                                        </td>
+                                        <th class="object-title">
+                                            {intl l="company"}
+                                        </th>
 
-                                        <td class="object-title">
-                                            {$FIRSTNAME} {$LASTNAME}
-                                        </td>
+                                        {module_include location='category_list_header'}
 
-                                        {module_include location='customer_list_row'}
+                                        <th>
+                                            {intl l="firstname & lastname"}
+                                        </th>
 
-                                        <td>
-                                            {format_date date=$LASTORDER_DATE}
-                                        </td>
+                                        <th>
+                                            {intl l="last order"}
+                                        </th>
 
-                                        <td>
-                                            {format_number number=$LASTORDER_AMOUNT}
-                                        </td>
-                                        <td>
-                                            <div class="btn-group">
-
-                                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.customer.edit"}
-                                                    <a class="btn btn-default btn-xs" title="{intl l='Edit this customer'}" href="{url path="/admin/customer/update/{$ID}" }"><i class="glyphicon glyphicon-edit"></i></a>
-                                                {/loop}
-                                                {loop type="auth" name="can_send_mail" roles="ADMIN" permissions="admin.customer.sendMail"}
-                                                    <a class="btn btn-default btn-xs" title="{intl l="Send a mail to this customer"}" href="mailto:{$EMAIL}"><span class="glyphicon glyphicon-envelope"></span></a>
-                                                {/loop}
-                                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"}
-                                                    <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_customer_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-                                                {/loop}
-                                            </div>
-                                        </td>
+                                        <th>{intl l='order amount'}</th>
 
+                                        <th class="actions">{intl l='Actions'}</th>
                                     </tr>
-                                {/loop}
-                                </tbody>
-                                <tfoot>
-                                    <tr>
-                                        <td colspan="6">
-                                            
-                                            <div class="text-center">
-                                                <ul class="pagination pagination-centered">
-                                                    {if $customer_page != 1}
-                                                        <li><a href="{url path="/admin/customers" page="1"}">&laquo;</a></li>
-                                                    {else}
-                                                        <li class="disabled"><a href="#">&laquo;</a></li>
-                                                    {/if}
+                                    </thead>
 
-                                                {pageloop rel="customer_list"}
-                                                    {if $PAGE != $CURRENT}
-                                                        <li><a href="{url path="/admin/customers" page="{$PAGE}"}">{$PAGE}</a></li>
+                                    <tbody>
+                                    {loop name="customer_list" type="customer" current="false" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}}
+                                        <tr>
+                                            <td><a href="{url path="/admin/customer/update/{$ID}" }">{$REF}</a></td>
 
-                                                    {else}
-                                                        <li class="active"><a href="#">{$PAGE}</a></li>
-                                                    {/if}
+                                            <td>
+                                                {$COMPANY}
+                                            </td>
+
+                                            <td class="object-title">
+                                                {$FIRSTNAME} {$LASTNAME}
+                                            </td>
+
+                                            {module_include location='customer_list_row'}
+
+                                            <td>
+                                                {format_date date=$LASTORDER_DATE}
+                                            </td>
+
+                                            <td>
+                                                {format_number number=$LASTORDER_AMOUNT}
+                                            </td>
+                                            <td>
+                                                <div class="btn-group">
+
+                                                    {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.customer.edit"}
+                                                        <a class="btn btn-default btn-xs" title="{intl l='Edit this customer'}" href="{url path="/admin/customer/update/{$ID}" }"><i class="glyphicon glyphicon-edit"></i></a>
+                                                    {/loop}
+                                                    {loop type="auth" name="can_send_mail" roles="ADMIN" permissions="admin.customer.sendMail"}
+                                                        <a class="btn btn-default btn-xs" title="{intl l="Send a mail to this customer"}" href="mailto:{$EMAIL}"><span class="glyphicon glyphicon-envelope"></span></a>
+                                                    {/loop}
+                                                    {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"}
+                                                        <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_customer_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+                                                    {/loop}
+                                                </div>
+                                            </td>
+
+                                        </tr>
+                                    {/loop}
+                                    </tbody>
+                                    <tfoot>
+                                        <tr>
+                                            <td colspan="6">
+                                                
+                                                <div class="text-center">
+                                                    <ul class="pagination pagination-centered">
+                                                        {if $customer_page != 1}
+                                                            <li><a href="{url path="/admin/customers" page="1"}">&laquo;</a></li>
+                                                        {else}
+                                                            <li class="disabled"><a href="#">&laquo;</a></li>
+                                                        {/if}
+
+                                                    {pageloop rel="customer_list"}
+                                                        {if $PAGE != $CURRENT}
+                                                            <li><a href="{url path="/admin/customers" page="{$PAGE}"}">{$PAGE}</a></li>
+
+                                                        {else}
+                                                            <li class="active"><a href="#">{$PAGE}</a></li>
+                                                        {/if}
 
 
-                                                {/pageloop}
-                                                    {if $PAGE == $LAST && $LAST != $CURRENT}
-                                                        <li><a href="{url path="/admin/customers" page="$PAGE"}">&raquo;</a></li>
-                                                    {else}
-                                                        <li class="disabled"><a href="#">&raquo;</a></li>
-                                                    {/if}
-                                                </ul>
-                                            </div>
-                                            
-                                        </td>
-                                    </tr>
-                                </tfoot>
-                            {/ifloop}
-                        </table>
+                                                    {/pageloop}
+                                                        {if $PAGE == $LAST && $LAST != $CURRENT}
+                                                            <li><a href="{url path="/admin/customers" page="$PAGE"}">&raquo;</a></li>
+                                                        {else}
+                                                            <li class="disabled"><a href="#">&raquo;</a></li>
+                                                        {/if}
+                                                    </ul>
+                                                </div>
+                                                
+                                            </td>
+                                        </tr>
+                                    </tfoot>
+                                {/ifloop}
+                            </table>
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/templates/admin/default/feature-edit.html b/templates/admin/default/feature-edit.html
index 7bbed5965..a21c63f61 100644
--- a/templates/admin/default/feature-edit.html
+++ b/templates/admin/default/feature-edit.html
@@ -77,95 +77,97 @@
 		     						    <div class="alert alert-info">
 		     						     {intl l="Enter here all possible feature values."}
 		     						    </div>
+                                        
+                                        <div class="table-responsive">
+    				                        <table class="table table-striped table-condensed table-left-aligned">
+    				                            <thead>
+    				                                <tr>
+    				                                    <th>
+    				                                        {admin_sortable_header
+    				                                            current_order=$featureav_order
+    				                                            order='id'
+    				                                            reverse_order='id_reverse'
+    				                                            request_parameter_name='featureav_order'
+    				                                            path={url path='/admin/configuration/features/update' feature_id=$feature_id}
+    				                                            label="{intl l='ID'}"
+    				                                        }
+    				                                    </th>
 
-				                        <table class="table table-striped table-condensed table-left-aligned">
-				                            <thead>
-				                                <tr>
-				                                    <th>
-				                                        {admin_sortable_header
-				                                            current_order=$featureav_order
-				                                            order='id'
-				                                            reverse_order='id_reverse'
-				                                            request_parameter_name='featureav_order'
-				                                            path={url path='/admin/configuration/features/update' feature_id=$feature_id}
-				                                            label="{intl l='ID'}"
-				                                        }
-				                                    </th>
+    				                                    <th>
+    				                                        {admin_sortable_header
+    				                                            current_order=$featureav_order
+    				                                            order='alpha'
+    				                                            reverse_order='alpha_reverse'
+    				                                            request_parameter_name='featureav_order'
+    				                                            path={url path='/admin/configuration/features/update' feature_id=$feature_id}
+    				                                            label="{intl l='Value'}"
+    				                                        }
+    				                                    </th>
 
-				                                    <th>
-				                                        {admin_sortable_header
-				                                            current_order=$featureav_order
-				                                            order='alpha'
-				                                            reverse_order='alpha_reverse'
-				                                            request_parameter_name='featureav_order'
-				                                            path={url path='/admin/configuration/features/update' feature_id=$feature_id}
-				                                            label="{intl l='Value'}"
-				                                        }
-				                                    </th>
+    				                                    <th class="text-center">
+    				                                        {admin_sortable_header
+    				                                            current_order=$featureav_order
+    				                                            order='manual'
+    				                                            reverse_order='manual_reverse'
+    				                                            request_parameter_name='featureav_order'
+    				                                            path={url path='/admin/configuration/features/update' feature_id=$feature_id}
+    				                                            label="{intl l="Position"}"
+    				                                        }
+    				                                    </th>
 
-				                                    <th class="text-center">
-				                                        {admin_sortable_header
-				                                            current_order=$featureav_order
-				                                            order='manual'
-				                                            reverse_order='manual_reverse'
-				                                            request_parameter_name='featureav_order'
-				                                            path={url path='/admin/configuration/features/update' feature_id=$feature_id}
-				                                            label="{intl l="Position"}"
-				                                        }
-				                                    </th>
+    				                                    {module_include location='features_value_table_header'}
 
-				                                    {module_include location='features_value_table_header'}
+    				                                    <th class="actions">{intl l="Actions"}</th>
+    				                                </tr>
+    				                            </thead>
 
-				                                    <th class="actions">{intl l="Actions"}</th>
-				                                </tr>
-				                            </thead>
+    				                            <tbody>
+    				                                {loop name="list" type="feature_availability" feature=$feature_id backend_context="1" lang=$edit_language_id order=$featureav_order}
+    				                                <tr>
+    				                                    <td>{$ID}</td>
 
-				                            <tbody>
-				                                {loop name="list" type="feature_availability" feature=$feature_id backend_context="1" lang=$edit_language_id order=$featureav_order}
-				                                <tr>
-				                                    <td>{$ID}</td>
+    				                                    <td>
+    				                                        {* FIXME : integrate this in the encolsing form to provide standard form processing *}
+    				                                        <input class="js-edit form-control" type="text" name="feature_values[{$ID}]" value="{$TITLE}" />
+    				                                    </td>
 
-				                                    <td>
-				                                        {* FIXME : integrate this in the encolsing form to provide standard form processing *}
-				                                        <input class="js-edit form-control" type="text" name="feature_values[{$ID}]" value="{$TITLE}" />
-				                                    </td>
+    				                                    <td class="text-center">
+    				                                        {admin_position_block
+    				                                        permission="admin.features.edit"
+    				                                        path={url path='/admin/configuration/features-av/update-position' feature_id=$feature_id}
+    				                                        url_parameter="featureav_id"
+    				                                        in_place_edit_class="positionChange"
+    				                                        position="$POSITION"
+    				                                        id="$ID"
+    				                                        }
+    				                                    </td>
 
-				                                    <td class="text-center">
-				                                        {admin_position_block
-				                                        permission="admin.features.edit"
-				                                        path={url path='/admin/configuration/features-av/update-position' feature_id=$feature_id}
-				                                        url_parameter="featureav_id"
-				                                        in_place_edit_class="positionChange"
-				                                        position="$POSITION"
-				                                        id="$ID"
-				                                        }
-				                                    </td>
+    				                                    {module_include location='features_value_table_row'}
 
-				                                    {module_include location='features_value_table_row'}
+    				                                    <td class="actions">
+    				                                        <div class="btn-group">
+    				                                            {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.feature-av.delete"}
+    				                                               <a class="btn btn-default btn-xs value-delete" title="{intl l='Delete this value'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal">
+    				                                                <span class="glyphicon glyphicon-trash"></span>
+    				                                               </a>
+    				                                            {/loop}
+    				                                        </div>
+    				                                    </td>
+    				                                </tr>
+    				                                 {/loop}
 
-				                                    <td class="actions">
-				                                        <div class="btn-group">
-				                                            {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.feature-av.delete"}
-				                                               <a class="btn btn-default btn-xs value-delete" title="{intl l='Delete this value'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal">
-				                                                <span class="glyphicon glyphicon-trash"></span>
-				                                               </a>
-				                                            {/loop}
-				                                        </div>
-				                                    </td>
-				                                </tr>
-				                                 {/loop}
-
-				                                 {elseloop rel="list"}
-				                                     <tr>
-				                                         <td colspan="4">
-				                                             <div class="alert alert-info">
-				                                                 {intl l="No value has been created yet. Click the + button to create one."}
-				                                             </div>
-				                                         </td>
-				                                     </tr>
-				                                 {/elseloop}
-				                            </tbody>
-				                        </table>
+    				                                 {elseloop rel="list"}
+    				                                     <tr>
+    				                                         <td colspan="4">
+    				                                             <div class="alert alert-info">
+    				                                                 {intl l="No value has been created yet. Click the + button to create one."}
+    				                                             </div>
+    				                                         </td>
+    				                                     </tr>
+    				                                 {/elseloop}
+    				                            </tbody>
+    				                        </table>
+                                        </div>
 		     						</div>
 		     				    </form>
 	     			            {/form}
diff --git a/templates/admin/default/features.html b/templates/admin/default/features.html
index 69ed1d5d4..683374aa8 100644
--- a/templates/admin/default/features.html
+++ b/templates/admin/default/features.html
@@ -21,117 +21,119 @@
             <div class="col-md-12">
                 <form action="#" method="post">
 	                <div class="general-block-decorator">
-	                    <table class="table table-striped table-condensed table-left-aligned">
-	                        <caption>
-	                           {intl l='Thelia product features'}
+                        <div class="table-responsive">
+    	                    <table class="table table-striped table-condensed table-left-aligned">
+    	                        <caption>
+    	                           {intl l='Thelia product features'}
 
-                                {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.features.create"}
-                                <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new product feature'}" href="#creation_dialog" data-toggle="modal">
-                                    <span class="glyphicon glyphicon-plus-sign"></span>
-                                </a>
-                                {/loop}
-	                        </caption>
-                            <thead>
-                                <tr>
-                                    <th>
-                                        {admin_sortable_header
-	                                        current_order=$order
-	                                        order='id'
-	                                        reverse_order='id_reverse'
-	                                        path='/admin/configuration/features'
-	                                        label="{intl l='ID'}"
-                                        }
-                                    </th>
+                                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.features.create"}
+                                    <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new product feature'}" href="#creation_dialog" data-toggle="modal">
+                                        <span class="glyphicon glyphicon-plus-sign"></span>
+                                    </a>
+                                    {/loop}
+    	                        </caption>
+                                <thead>
+                                    <tr>
+                                        <th>
+                                            {admin_sortable_header
+    	                                        current_order=$order
+    	                                        order='id'
+    	                                        reverse_order='id_reverse'
+    	                                        path='/admin/configuration/features'
+    	                                        label="{intl l='ID'}"
+                                            }
+                                        </th>
 
-                                    <th>
-                                        {admin_sortable_header
-	                                        current_order=$order
-	                                        order='alpha'
-	                                        reverse_order='alpha_reverse'
-	                                        path='/admin/configuration/features'
-	                                        label="{intl l='Title'}"
-                                        }
-                                    </th>
+                                        <th>
+                                            {admin_sortable_header
+    	                                        current_order=$order
+    	                                        order='alpha'
+    	                                        reverse_order='alpha_reverse'
+    	                                        path='/admin/configuration/features'
+    	                                        label="{intl l='Title'}"
+                                            }
+                                        </th>
 
-                                    <th class="text-center">
-                                        {admin_sortable_header
-	                                        current_order=$order
-	                                        order='manual'
-	                                        reverse_order='manual_reverse'
-	                                        path='/admin/configuration/features'
-	                                        label="{intl l="Position"}"
-                                        }
-                                    </th>
+                                        <th class="text-center">
+                                            {admin_sortable_header
+    	                                        current_order=$order
+    	                                        order='manual'
+    	                                        reverse_order='manual_reverse'
+    	                                        path='/admin/configuration/features'
+    	                                        label="{intl l="Position"}"
+                                            }
+                                        </th>
 
-                                    {module_include location='features_table_header'}
+                                        {module_include location='features_table_header'}
 
-                                    <th class="actions">{intl l="Actions"}</th>
-                                </tr>
-                            </thead>
+                                        <th class="actions">{intl l="Actions"}</th>
+                                    </tr>
+                                </thead>
 
-                            <tbody>
-                                {loop name="list" type="feature" backend_context="1" lang=$lang_id order=$order}
-                                <tr>
-                                    <td>{$ID}</td>
+                                <tbody>
+                                    {loop name="list" type="feature" backend_context="1" lang=$lang_id order=$order}
+                                    <tr>
+                                        <td>{$ID}</td>
 
-                                    <td>
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.features.change"}
-                                            <a title="{intl l='Change this feature'}" href="{url path='/admin/configuration/features/update' feature_id=$ID}">{$TITLE}</a>
-                                        {/loop}
-                                        {elseloop rel="can_change"}
-                                            {$TITLE}
-                                        {/elseloop}
-                                    </td>
+                                        <td>
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.features.change"}
+                                                <a title="{intl l='Change this feature'}" href="{url path='/admin/configuration/features/update' feature_id=$ID}">{$TITLE}</a>
+                                            {/loop}
+                                            {elseloop rel="can_change"}
+                                                {$TITLE}
+                                            {/elseloop}
+                                        </td>
 
-                                    <td class="text-center">
-                                        {admin_position_block
-                                        permission="admin.features.edit"
-                                        path="/admin/configuration/features/update-position"
-                                        url_parameter="feature_id"
-                                        in_place_edit_class="positionChange"
-                                        position="$POSITION"
-                                        id="$ID"
-                                        }
-                                    </td>
+                                        <td class="text-center">
+                                            {admin_position_block
+                                            permission="admin.features.edit"
+                                            path="/admin/configuration/features/update-position"
+                                            url_parameter="feature_id"
+                                            in_place_edit_class="positionChange"
+                                            position="$POSITION"
+                                            id="$ID"
+                                            }
+                                        </td>
 
-                                    {module_include location='features_table_row'}
+                                        {module_include location='features_table_row'}
 
-                                    <td class="actions">
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.features.change"}
-                                        <div class="btn-group">
-                                            <a class="btn btn-default btn-xs feature-remove-from-all" title="{intl l='Remove this feature from all product templates'}" href="#remove_from_all_dialog" data-id="{$ID}" data-toggle="modal">
-                                                <span class="glyphicon glyphicon-minus"></span>
-                                            </a>
-                                            <a class="btn btn-default btn-xs feature-add-to-all" title="{intl l='Add this feature to all product templates'}" href="#add_to_all_dialog" data-id="{$ID}" data-toggle="modal">
-                                                <span class="glyphicon glyphicon-plus"></span>
-                                            </a>
-                                        </div>
-                                        {/loop}
+                                        <td class="actions">
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.features.change"}
+                                            <div class="btn-group">
+                                                <a class="btn btn-default btn-xs feature-remove-from-all" title="{intl l='Remove this feature from all product templates'}" href="#remove_from_all_dialog" data-id="{$ID}" data-toggle="modal">
+                                                    <span class="glyphicon glyphicon-minus"></span>
+                                                </a>
+                                                <a class="btn btn-default btn-xs feature-add-to-all" title="{intl l='Add this feature to all product templates'}" href="#add_to_all_dialog" data-id="{$ID}" data-toggle="modal">
+                                                    <span class="glyphicon glyphicon-plus"></span>
+                                                </a>
+                                            </div>
+                                            {/loop}
 
-                                        <div class="btn-group">
-	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.features.change"}
-	                                            <a class="btn btn-default btn-xs feature-change" title="{intl l='Change this product feature'}" href="{url path='/admin/configuration/features/update' feature_id=$ID}"><span class="glyphicon glyphicon-edit"></span></a>
-	                                        {/loop}
+                                            <div class="btn-group">
+    	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.features.change"}
+    	                                            <a class="btn btn-default btn-xs feature-change" title="{intl l='Change this product feature'}" href="{url path='/admin/configuration/features/update' feature_id=$ID}"><span class="glyphicon glyphicon-edit"></span></a>
+    	                                        {/loop}
 
-	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.features.delete"}
-	                                            <a class="btn btn-default btn-xs feature-delete" title="{intl l='Delete this product feature'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-	                                        {/loop}
-                                        </div>
-                                    </td>
-                                </tr>
-                                 {/loop}
+    	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.features.delete"}
+    	                                            <a class="btn btn-default btn-xs feature-delete" title="{intl l='Delete this product feature'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+    	                                        {/loop}
+                                            </div>
+                                        </td>
+                                    </tr>
+                                     {/loop}
 
-                                 {elseloop rel="list"}
-                                     <tr>
-                                         <td colspan="4">
-                                             <div class="alert alert-info">
-                                                 {intl l="No product feature has been created yet. Click the + button to create one."}
-                                             </div>
-                                         </td>
-                                     </tr>
-                                 {/elseloop}
-                            </tbody>
-	                    </table>
+                                     {elseloop rel="list"}
+                                         <tr>
+                                             <td colspan="4">
+                                                 <div class="alert alert-info">
+                                                     {intl l="No product feature has been created yet. Click the + button to create one."}
+                                                 </div>
+                                             </td>
+                                         </tr>
+                                     {/elseloop}
+                                </tbody>
+    	                    </table>
+                        </div>
 	                </div>
                 </form>
             </div>
diff --git a/templates/admin/default/folders.html b/templates/admin/default/folders.html
index e836770ab..90646c9bc 100644
--- a/templates/admin/default/folders.html
+++ b/templates/admin/default/folders.html
@@ -15,163 +15,164 @@
 
         <div class="row">
             <div class="col-md-12">
-            <div class="general-block-decorator">
+                <div class="general-block-decorator">
+                    <div class="table-responsive">
+                        <table class="table table-striped table-condensed" id="folder_list">
+                         <caption>
+                             {* display parent folder name, and get current folder ID *}
+                             {loop name="folder_title" type="folder" visible="*" id=$folder_id}
+                                 {intl l="Folders in %fold" fold=$TITLE}
+                                 {$fold_id = $ID}
+                             {/loop}
+                             {elseloop rel="folder_title"}
+                                 {intl l="Top level folders"}
+                             {/elseloop}
 
-                 <table class="table table-striped table-condensed" id="folder_list">
-                     <caption>
-                         {* display parent folder name, and get current folder ID *}
-                         {loop name="folder_title" type="folder" visible="*" id=$folder_id}
-                             {intl l="Folders in %fold" fold=$TITLE}
-                             {$fold_id = $ID}
-                         {/loop}
-                         {elseloop rel="folder_title"}
-                             {intl l="Top level folders"}
-                         {/elseloop}
+                             {module_include location='folder_list_caption'}
 
-                         {module_include location='folder_list_caption'}
+                             {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.folders.create"}
+                             <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new folder'}" href="#folder_creation_dialog" data-toggle="modal">
+                                 <span class="glyphicon glyphicon-plus-sign"></span>
+                             </a>
+                             {/loop}
+                         </caption>
 
-                         {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.folders.create"}
-                         <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new folder'}" href="#folder_creation_dialog" data-toggle="modal">
-                             <span class="glyphicon glyphicon-plus-sign"></span>
-                         </a>
-                         {/loop}
-                     </caption>
+                         {ifloop rel="folder_list"}
+                             <thead>
+                                 <tr>
+                                     <th class="object-title">
+                                     {admin_sortable_header
+                                        current_order=$folder_order
+                                        order='id'
+                                        reverse_order='id_reverse'
+                                        path={url path='/admin/folders' id_folder=$folder_id}
+                                        request_parameter_name='folder_order'
+                                        label="{intl l='ID'}"
+                                     }
+                                     </th>
 
-                     {ifloop rel="folder_list"}
+                                     <th class="object-image">&nbsp;</th>
+
+                                     <th class="object-title">
+                                     {admin_sortable_header
+                                        current_order=$folder_order
+                                        order='alpha'
+                                        reverse_order='alpha_reverse'
+                                        path={url path='/admin/folders' id_folder=$folder_id}
+                                        request_parameter_name='folder_order'
+                                        label="{intl l='Folder title'}"
+                                     }
+                                     </th>
+
+                                     {module_include location='folder_list_header'}
+
+                                     <th>
+                                     {admin_sortable_header
+                                        current_order=$folder_order
+                                        order='visible'
+                                        reverse_order='visible_reverse'
+                                        path={url path='/admin/folders' id_folder=$folder_id}
+                                        request_parameter_name='folder_order'
+                                        label="{intl l='Online'}"
+                                     }
+                                     </th>
+
+                                     <th>
+                                     {admin_sortable_header
+                                        current_order=$folder_order
+                                        order='manual'
+                                        reverse_order='manual_reverse'
+                                        path={url path='/admin/folders' id_folder=$folder_id}
+                                        request_parameter_name='folder_order'
+                                        label="{intl l='Position'}"
+                                     }
+                                     </th>
+
+                                     <th class="actions">{intl l='Actions'}</th>
+                                 </tr>
+                             </thead>
+
+                             <tbody>
+                             {loop name="folder_list" type="folder" visible="*" parent=$folder_id order=$folder_order backend_context="1" lang=$lang_id}
+                             <tr>
+                                 <td>{$ID}</td>
+
+                                 <td>
+                                 {loop type="image" name="folder_image" source="folder" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
+                                   <a href="{url path='admin/folder' folder_id=$ID}" title="{intl l='Browse this folder'}"><img class="img-thumbnail" src="{$IMAGE_URL}" alt="{$TITLE}" /></a>
+                                 {/loop}
+                                 </td>
+
+                                 <td class="object-title">
+                                      <a href="{url path='admin/folder' folder_id=$ID}" title="{intl l='Browse this folder'}">
+                                        {$TITLE}
+                                      </a>
+                                 </td>
+
+                                 {module_include location='folder_list_row'}
+
+                                 <td>
+                                     {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.folders.edit"}
+                                         <div class="make-switch switch-small folderVisibleToggle" data-id="{$ID}"  data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                             <input type="checkbox" class="folderVisibleToggle" {if $VISIBLE == 1}checked="checked"{/if}>
+                                         </div>
+                                     {/loop}
+
+                                     {elseloop rel="can_change"}
+                                         <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                             <input type="checkbox" class="disabled" disabled="disabled" {if $VISIBLE == 1}checked="checked"{/if}>
+                                         </div>
+                                     {/elseloop}
+                                 </td>
+
+                                 <td>
+                                 {admin_position_block
+                                     permission="admin.folders.edit"
+                                     path={url path='admin/folders/update-position' folder_id=$ID}
+                                     url_parameter="folder_id"
+                                     in_place_edit_class="folderPositionChange"
+                                     position=$POSITION
+                                     id=$ID
+                                  }
+                                 </td>
+
+                                 <td class="actions">
+                                     <div class="btn-group">
+                                         <a class="btn btn-default btn-xs" title="{intl l='Browse this folder'}" href="{url path='admin/folder' folder_id=$ID}"><i class="glyphicon glyphicon-folder-open"></i></a>
+
+                                         {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.folders.edit"}
+                                            <a class="btn btn-default btn-xs" title="{intl l='Edit this folder'}" href="{url path='/admin/folders/update' folder_id=$ID}"><i class="glyphicon glyphicon-edit"></i></a>
+                                         {/loop}
+
+                                         {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.folders.delete"}
+                                            <a class="btn btn-default btn-xs folder-delete" title="{intl l='Delete this folder and all its contents'}"  href="#folder_delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                         {/loop}
+                                     </div>
+                                  </td>
+                             </tr>
+                             {/loop}
+                             </tbody>
+                         {/ifloop}
+
+                         {elseloop rel="folder_list"}
                          <thead>
                              <tr>
-                                 <th class="object-title">
-                                 {admin_sortable_header
-                                    current_order=$folder_order
-                                    order='id'
-                                    reverse_order='id_reverse'
-                                    path={url path='/admin/folders' id_folder=$folder_id}
-                                    request_parameter_name='folder_order'
-                                    label="{intl l='ID'}"
-                                 }
-                                 </th>
+                                 <td class="message">
+                                     <div class="alert alert-info">
+                                     {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.folders.create"}
+                                         {intl l="This folder has no sub-folders. To create a new one, click the + button above."}
+                                     {/loop}
 
-                                 <th class="object-image">&nbsp;</th>
-
-                                 <th class="object-title">
-                                 {admin_sortable_header
-                                    current_order=$folder_order
-                                    order='alpha'
-                                    reverse_order='alpha_reverse'
-                                    path={url path='/admin/folders' id_folder=$folder_id}
-                                    request_parameter_name='folder_order'
-                                    label="{intl l='Folder title'}"
-                                 }
-                                 </th>
-
-                                 {module_include location='folder_list_header'}
-
-                                 <th>
-                                 {admin_sortable_header
-                                    current_order=$folder_order
-                                    order='visible'
-                                    reverse_order='visible_reverse'
-                                    path={url path='/admin/folders' id_folder=$folder_id}
-                                    request_parameter_name='folder_order'
-                                    label="{intl l='Online'}"
-                                 }
-                                 </th>
-
-                                 <th>
-                                 {admin_sortable_header
-                                    current_order=$folder_order
-                                    order='manual'
-                                    reverse_order='manual_reverse'
-                                    path={url path='/admin/folders' id_folder=$folder_id}
-                                    request_parameter_name='folder_order'
-                                    label="{intl l='Position'}"
-                                 }
-                                 </th>
-
-                                 <th class="actions">{intl l='Actions'}</th>
+                                     {elseloop rel="can_create"}
+                                        {intl l="This folder has no sub-folders."}
+                                     {/elseloop}
+                                     </div>
+                                 </td>
                              </tr>
                          </thead>
-
-                         <tbody>
-                         {loop name="folder_list" type="folder" visible="*" parent=$folder_id order=$folder_order backend_context="1" lang=$lang_id}
-                         <tr>
-                             <td>{$ID}</td>
-
-                             <td>
-                             {loop type="image" name="folder_image" source="folder" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
-                               <a href="{url path='admin/folder' folder_id=$ID}" title="{intl l='Browse this folder'}"><img class="img-thumbnail" src="{$IMAGE_URL}" alt="{$TITLE}" /></a>
-                             {/loop}
-                             </td>
-
-                             <td class="object-title">
-                                  <a href="{url path='admin/folder' folder_id=$ID}" title="{intl l='Browse this folder'}">
-                                    {$TITLE}
-                                  </a>
-                             </td>
-
-                             {module_include location='folder_list_row'}
-
-                             <td>
-                                 {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.folders.edit"}
-                                     <div class="make-switch switch-small folderVisibleToggle" data-id="{$ID}"  data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
-                                         <input type="checkbox" class="folderVisibleToggle" {if $VISIBLE == 1}checked="checked"{/if}>
-                                     </div>
-                                 {/loop}
-
-                                 {elseloop rel="can_change"}
-                                     <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
-                                         <input type="checkbox" class="disabled" disabled="disabled" {if $VISIBLE == 1}checked="checked"{/if}>
-                                     </div>
-                                 {/elseloop}
-                             </td>
-
-                             <td>
-                             {admin_position_block
-                                 permission="admin.folders.edit"
-                                 path={url path='admin/folders/update-position' folder_id=$ID}
-                                 url_parameter="folder_id"
-                                 in_place_edit_class="folderPositionChange"
-                                 position=$POSITION
-                                 id=$ID
-                              }
-                             </td>
-
-                             <td class="actions">
-                                 <div class="btn-group">
-                                     <a class="btn btn-default btn-xs" title="{intl l='Browse this folder'}" href="{url path='admin/folder' folder_id=$ID}"><i class="glyphicon glyphicon-folder-open"></i></a>
-
-                                     {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.folders.edit"}
-                                        <a class="btn btn-default btn-xs" title="{intl l='Edit this folder'}" href="{url path='/admin/folders/update' folder_id=$ID}"><i class="glyphicon glyphicon-edit"></i></a>
-                                     {/loop}
-
-                                     {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.folders.delete"}
-                                        <a class="btn btn-default btn-xs folder-delete" title="{intl l='Delete this folder and all its contents'}"  href="#folder_delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
-                                     {/loop}
-                                 </div>
-                              </td>
-                         </tr>
-                         {/loop}
-                         </tbody>
-                     {/ifloop}
-
-                     {elseloop rel="folder_list"}
-                     <thead>
-                         <tr>
-                             <td class="message">
-                                 <div class="alert alert-info">
-                                 {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.folders.create"}
-                                     {intl l="This folder has no sub-folders. To create a new one, click the + button above."}
-                                 {/loop}
-
-                                 {elseloop rel="can_create"}
-                                    {intl l="This folder has no sub-folders."}
-                                 {/elseloop}
-                                 </div>
-                             </td>
-                         </tr>
-                     </thead>
-                     {/elseloop}
-                 </table>
+                         {/elseloop}
+                        </table>
+                    </div>
                 </div>
             </div>
         </div>
@@ -181,7 +182,7 @@
      <div class="row">
          <div class="col-md-12">
              <div class="general-block-decorator">
-
+                <div class="table-responsive">
                  <table class="table table-striped table-condensed">
                      <caption>
                          {* display parent folder name *}
@@ -314,7 +315,7 @@
                      </thead>
                      {/elseloop}
                  </table>
-
+                </div>
 
              </div>
             </div>
diff --git a/templates/admin/default/home.html b/templates/admin/default/home.html
index c5683620f..ea1bd3392 100755
--- a/templates/admin/default/home.html
+++ b/templates/admin/default/home.html
@@ -48,50 +48,52 @@
 	 			<div class="col-md-4">
 					<div class="general-block-decorator">
 						<div class="title title-without-tabs">{intl l="Informations site"}</div>
-						<table class="table table-striped">
-							<tbody>
-								<tr>
-									<th>{intl l="Customers"}</th>
-	                                <td>1</td>
-								</tr>
-								<tr>
-									<th>{intl l="Sections"}</th>
-	                                <td>8</td>
-								</tr>
-								<tr>
-									<th>{intl l="Products"}</th>
-	                                <td>43</td>
-								</tr>
-								<tr>
-									<th>{intl l="Products online"}</th>
-	                                <td>43</td>
-								</tr>
-								<tr>
-									<th>{intl l="Products offline"}</th>
-	                                <td>0</td>
-								</tr>
-								<tr>
-									<th>{intl l="Orders"}</th>
-	                                <td>1</td>
-								</tr>
-								<tr>
-									<th>{intl l="Orders pending"}</th>
-	                                <td>1</td>
-								</tr>
-								<tr>
-									<th>{intl l="Orders treatment"}</th>
-	                                <td>0</td>
-								</tr>
-								<tr>
-									<th>{intl l="Shipped orders"}</th>
-	                                <td>0</td>
-								</tr>
-								<tr>
-									<th>{intl l="Canceled orders"}</th>
-	                                <td>0</td>
-								</tr>
-				            </tbody>
-				        </table>
+						<div class="table-responsive">
+							<table class="table table-striped">
+								<tbody>
+									<tr>
+										<th>{intl l="Customers"}</th>
+		                                <td>1</td>
+									</tr>
+									<tr>
+										<th>{intl l="Sections"}</th>
+		                                <td>8</td>
+									</tr>
+									<tr>
+										<th>{intl l="Products"}</th>
+		                                <td>43</td>
+									</tr>
+									<tr>
+										<th>{intl l="Products online"}</th>
+		                                <td>43</td>
+									</tr>
+									<tr>
+										<th>{intl l="Products offline"}</th>
+		                                <td>0</td>
+									</tr>
+									<tr>
+										<th>{intl l="Orders"}</th>
+		                                <td>1</td>
+									</tr>
+									<tr>
+										<th>{intl l="Orders pending"}</th>
+		                                <td>1</td>
+									</tr>
+									<tr>
+										<th>{intl l="Orders treatment"}</th>
+		                                <td>0</td>
+									</tr>
+									<tr>
+										<th>{intl l="Shipped orders"}</th>
+		                                <td>0</td>
+									</tr>
+									<tr>
+										<th>{intl l="Canceled orders"}</th>
+		                                <td>0</td>
+									</tr>
+					            </tbody>
+					        </table>
+					    </div>
 					</div>
 				</div>
 
@@ -107,106 +109,112 @@
 
 						<div class="tab-content">
 							<div class="tab-pane fade active in" id="statjour">
-								<table class="table table-striped">
-	                                <tbody>
-	                                	<tr>
-	                                        <th>{intl l="C. A. TTC"}</th>
-	                                        <td>2000.00 €</td>
-	                                    </tr>
-	                                    <tr>
-	                                        <th>{intl l="C. A. TTC hors frais de port"}</th>
-	                                        <td>2500.00 €</td>
-	                                    </tr>
-	                                    <tr>
-	                                        <th>{intl l="C. A. TTC précédent"}</th>
-	                                        <td>1700.00 €</td>
-	                                    </tr>
-	                                    <tr>
-	                                        <th>{intl l="Commandes en instance"}</th>
-	                                        <td>4</td>
-	                                    </tr>
-	                                    <tr>
-	                                        <th>{intl l="Commandes en traitement"}</th>
-	                                        <td>52</td>
-	                                    </tr>
-	                                    <tr>
-	                                        <th>{intl l="Commandes annulées"}</th>
-	                                        <td>3</td>
-	                                    </tr>
-	                                    <tr>
-	                                        <th>{intl l="Panier moyen TTC"}</th>
-	                                        <td>25.00 €</td>
-	                                    </tr>
-	                           		</tbody>
-	                        	</table>
+								<div class="table-responsive">
+									<table class="table table-striped">
+		                                <tbody>
+		                                	<tr>
+		                                        <th>{intl l="C. A. TTC"}</th>
+		                                        <td>2000.00 €</td>
+		                                    </tr>
+		                                    <tr>
+		                                        <th>{intl l="C. A. TTC hors frais de port"}</th>
+		                                        <td>2500.00 €</td>
+		                                    </tr>
+		                                    <tr>
+		                                        <th>{intl l="C. A. TTC précédent"}</th>
+		                                        <td>1700.00 €</td>
+		                                    </tr>
+		                                    <tr>
+		                                        <th>{intl l="Commandes en instance"}</th>
+		                                        <td>4</td>
+		                                    </tr>
+		                                    <tr>
+		                                        <th>{intl l="Commandes en traitement"}</th>
+		                                        <td>52</td>
+		                                    </tr>
+		                                    <tr>
+		                                        <th>{intl l="Commandes annulées"}</th>
+		                                        <td>3</td>
+		                                    </tr>
+		                                    <tr>
+		                                        <th>{intl l="Panier moyen TTC"}</th>
+		                                        <td>25.00 €</td>
+		                                    </tr>
+		                           		</tbody>
+		                        	</table>
+		                        </div>
 	                        </div>
 							<div class="tab-pane fade" id="statmois">
-	                            <table class="table table-striped">
-	                                <tbody>
-	                                	<tr>
-	                                        <th>{intl l="C. A. TTC"}</th>
-	                                        <td>2000.00 €</td>
-	                                    </tr>
-	                                    <tr>
-	                                        <th>{intl l="C. A. TTC hors frais de port"}</th>
-	                                        <td>2500.00 €</td>
-	                                    </tr>
-	                                    <tr>
-	                                        <th>{intl l="C. A. TTC précédent"}</th>
-	                                        <td>1700.00 €</td>
-	                                    </tr>
-	                                    <tr>
-	                                        <th>{intl l="Commandes en instance"}</th>
-	                                        <td>4</td>
-	                                    </tr>
-	                                    <tr>
-	                                        <th>{intl l="Commandes en traitement"}</th>
-	                                        <td>52</td>
-	                                    </tr>
-	                                    <tr>
-	                                        <th>{intl l="Commandes annulées"}</th>
-	                                        <td>3</td>
-	                                    </tr>
-	                                    <tr>
-	                                        <th>{intl l="Panier moyen TTC"}</th>
-	                                        <td>25.00 €</td>
-	                                    </tr>
-	                           		</tbody>
-	                        	</table>
+								<div class="table-responsive">
+		                            <table class="table table-striped">
+		                                <tbody>
+		                                	<tr>
+		                                        <th>{intl l="C. A. TTC"}</th>
+		                                        <td>2000.00 €</td>
+		                                    </tr>
+		                                    <tr>
+		                                        <th>{intl l="C. A. TTC hors frais de port"}</th>
+		                                        <td>2500.00 €</td>
+		                                    </tr>
+		                                    <tr>
+		                                        <th>{intl l="C. A. TTC précédent"}</th>
+		                                        <td>1700.00 €</td>
+		                                    </tr>
+		                                    <tr>
+		                                        <th>{intl l="Commandes en instance"}</th>
+		                                        <td>4</td>
+		                                    </tr>
+		                                    <tr>
+		                                        <th>{intl l="Commandes en traitement"}</th>
+		                                        <td>52</td>
+		                                    </tr>
+		                                    <tr>
+		                                        <th>{intl l="Commandes annulées"}</th>
+		                                        <td>3</td>
+		                                    </tr>
+		                                    <tr>
+		                                        <th>{intl l="Panier moyen TTC"}</th>
+		                                        <td>25.00 €</td>
+		                                    </tr>
+		                           		</tbody>
+		                        	</table>
+		                        </div>
 							</div>
 							<div class="tab-pane fade" id="statannee">
-	                            <table class="table table-striped">
-	                                <tbody>
-	                                	<tr>
-	                                        <th>{intl l="C. A. TTC"}</th>
-	                                        <td>2000.00 €</td>
-	                                    </tr>
-	                                    <tr>
-	                                        <th>{intl l="C. A. TTC hors frais de port"}</th>
-	                                        <td>2500.00 €</td>
-	                                    </tr>
-	                                    <tr>
-	                                        <th>{intl l="C. A. TTC précédent"}</th>
-	                                        <td>1700.00 €</td>
-	                                    </tr>
-	                                    <tr>
-	                                        <th>{intl l="Commandes en instance"}</th>
-	                                        <td>4</td>
-	                                    </tr>
-	                                    <tr>
-	                                        <th>{intl l="Commandes en traitement"}</th>
-	                                        <td>52</td>
-	                                    </tr>
-	                                    <tr>
-	                                        <th>{intl l="Commandes annulées"}</th>
-	                                        <td>3</td>
-	                                    </tr>
-	                                    <tr>
-	                                        <th>{intl l="Panier moyen TTC"}</th>
-	                                        <td>25.00 €</td>
-	                                    </tr>
-	                           		</tbody>
-	                            </table>
+								<div class="table-responsive">
+		                            <table class="table table-striped">
+		                                <tbody>
+		                                	<tr>
+		                                        <th>{intl l="C. A. TTC"}</th>
+		                                        <td>2000.00 €</td>
+		                                    </tr>
+		                                    <tr>
+		                                        <th>{intl l="C. A. TTC hors frais de port"}</th>
+		                                        <td>2500.00 €</td>
+		                                    </tr>
+		                                    <tr>
+		                                        <th>{intl l="C. A. TTC précédent"}</th>
+		                                        <td>1700.00 €</td>
+		                                    </tr>
+		                                    <tr>
+		                                        <th>{intl l="Commandes en instance"}</th>
+		                                        <td>4</td>
+		                                    </tr>
+		                                    <tr>
+		                                        <th>{intl l="Commandes en traitement"}</th>
+		                                        <td>52</td>
+		                                    </tr>
+		                                    <tr>
+		                                        <th>{intl l="Commandes annulées"}</th>
+		                                        <td>3</td>
+		                                    </tr>
+		                                    <tr>
+		                                        <th>{intl l="Panier moyen TTC"}</th>
+		                                        <td>25.00 €</td>
+		                                    </tr>
+		                           		</tbody>
+		                            </table>
+		                        </div>
 	                        </div>
 						</div>
 					</div>
@@ -215,22 +223,24 @@
 				<div class="col-md-4">
 					<div class="general-block-decorator">
 						<div class="title title-without-tabs">{intl l="Thelia informations"}</div>
-						<table class="table table-striped">
+						<div class="table-responsive">
+							<table class="table table-striped">
 								<tbody>
-								<tr>
-									<th>{intl l="Current version"}</th>
-									<td>V2.0.0-beta</td>
-								</tr>
-								<tr>
-									<th>{intl l="Latest version available"}</th>
-									<td><a href="">V1.5.4.2</a></td>
-								</tr>
-								<tr>
-									<th>{intl l="News"}</th>
-									<td><a href="" target="_blank">{intl l="Click here"}</a></td>
-								</tr>
-							</tbody>
-						</table>
+									<tr>
+										<th>{intl l="Current version"}</th>
+										<td>V2.0.0-beta</td>
+									</tr>
+									<tr>
+										<th>{intl l="Latest version available"}</th>
+										<td><a href="">V1.5.4.2</a></td>
+									</tr>
+									<tr>
+										<th>{intl l="News"}</th>
+										<td><a href="" target="_blank">{intl l="Click here"}</a></td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
 					</div>
 				</div>
 
diff --git a/templates/admin/default/messages.html b/templates/admin/default/messages.html
index afa7764af..cf2a0d9e1 100644
--- a/templates/admin/default/messages.html
+++ b/templates/admin/default/messages.html
@@ -21,76 +21,78 @@
             <div class="col-md-12">
                 <form action="{url path='/admin/configuration/messages/update-values'}" method="post">
 	                <div class="general-block-decorator">
-	                    <table class="table table-striped table-condensed table-left-aligned">
-	                        <caption>
-	                           {intl l='Thelia mailing templates'}
-	                           {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.messages.create"}
-                                <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new mailing template'}" href="#creation_dialog" data-toggle="modal">
-                                    <span class="glyphicon glyphicon-plus-sign"></span>
-                                </a>
-                            {/loop}
+                        <div class="table-responsive">
+    	                    <table class="table table-striped table-condensed table-left-aligned">
+    	                        <caption>
+    	                           {intl l='Thelia mailing templates'}
+    	                           {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.messages.create"}
+                                    <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new mailing template'}" href="#creation_dialog" data-toggle="modal">
+                                        <span class="glyphicon glyphicon-plus-sign"></span>
+                                    </a>
+                                {/loop}
 
-	                        </caption>
-                            <thead>
-    	                        <tr>
-    	                           <th>{intl l="Purpose"}</th>
-                                   <th>{intl l="Name"}</th>
+    	                        </caption>
+                                <thead>
+        	                        <tr>
+        	                           <th>{intl l="Purpose"}</th>
+                                       <th>{intl l="Name"}</th>
 
-                                   {module_include location='messages_table_header'}
+                                       {module_include location='messages_table_header'}
 
-                                   <th>&nbsp;</th>
-    	                        </tr>
-                            </thead>
+                                       <th>&nbsp;</th>
+        	                        </tr>
+                                </thead>
 
-                            <tbody>
-    	                        {loop name="mailing-templates" type="message" secured="*" backend_context="1" lang="$lang_id"}
-    	                            <tr>
+                                <tbody>
+        	                        {loop name="mailing-templates" type="message" secured="*" backend_context="1" lang="$lang_id"}
+        	                            <tr>
 
-    	                               <td>{$TITLE}</td>
+        	                               <td>{$TITLE}</td>
 
-                                       <td>
-                                       {if ! $SECURED}
-                                           {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.messages.change"}
-                                               <a title="{intl l='Change this mailing template'}" href="{url path='/admin/configuration/messages/update' message_id="$ID"}">{$NAME}</a>
-                                           {/loop}
-                                           {elseloop rel="can_change"}
+                                           <td>
+                                           {if ! $SECURED}
+                                               {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.messages.change"}
+                                                   <a title="{intl l='Change this mailing template'}" href="{url path='/admin/configuration/messages/update' message_id="$ID"}">{$NAME}</a>
+                                               {/loop}
+                                               {elseloop rel="can_change"}
+                                                   {$NAME}
+                                               {/elseloop}
+                                           {else}
                                                {$NAME}
-                                           {/elseloop}
-                                       {else}
-                                           {$NAME}
-                                       {/if}
-                                       </td>
+                                           {/if}
+                                           </td>
 
-    	                                {module_include location='messages_table_row'}
+        	                                {module_include location='messages_table_row'}
 
-    	                                <td class="actions">
-    	                                    {if ! $SECURED}
-    		                                    <div class="btn-group">
-                                                   {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.messages.change"}
-                                                       <a class="btn btn-default btn-xs message-change" title="{intl l='Change this mailing template'}" href="{url path='/admin/configuration/messages/update' message_id="$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
-                                                   {/loop}
+        	                                <td class="actions">
+        	                                    {if ! $SECURED}
+        		                                    <div class="btn-group">
+                                                       {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.messages.change"}
+                                                           <a class="btn btn-default btn-xs message-change" title="{intl l='Change this mailing template'}" href="{url path='/admin/configuration/messages/update' message_id="$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                                       {/loop}
 
-                                                   {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.messages.delete"}
-                                                       <a class="btn btn-default btn-xs message-delete" title="{intl l='Delete this mailing template'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
-                                                   {/loop}
-    		                                    </div>
-    		                                {else}
-    		                                    <i title="{intl l='This mailing template could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
-    	                                    {/if}
-    	                                </td>
-    	                            </tr>
-    	                        {/loop}
-    	                        {elseloop rel="mailing-templates"}
-    	                        <tr>
-    	                           <td colspan="3">
-    	                               <div class="alert alert-info">
-    	                               {intl l="No mailing template has been created yet. Click the + button to create one."}
-    	                               </div>
-    	                           </td>
-    	                        </tr>
-    	                        {/elseloop}
-                            </tbody>
-	                    </table>
+                                                       {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.messages.delete"}
+                                                           <a class="btn btn-default btn-xs message-delete" title="{intl l='Delete this mailing template'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                                       {/loop}
+        		                                    </div>
+        		                                {else}
+        		                                    <i title="{intl l='This mailing template could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
+        	                                    {/if}
+        	                                </td>
+        	                            </tr>
+        	                        {/loop}
+        	                        {elseloop rel="mailing-templates"}
+        	                        <tr>
+        	                           <td colspan="3">
+        	                               <div class="alert alert-info">
+        	                               {intl l="No mailing template has been created yet. Click the + button to create one."}
+        	                               </div>
+        	                           </td>
+        	                        </tr>
+        	                        {/elseloop}
+                                </tbody>
+    	                    </table>
+                        </div>
 	                </div>
                 </form>
             </div>
diff --git a/templates/admin/default/modules.html b/templates/admin/default/modules.html
index 787e00a5b..8c86c349a 100644
--- a/templates/admin/default/modules.html
+++ b/templates/admin/default/modules.html
@@ -26,215 +26,219 @@
         <div class="row">
             <div class="col-md-12">
                 <div class="general-block-decorator">
-                    <table class="table table-striped table-condensed table-left-aligned">
-                        <caption class="clearfix">
-                           {intl l='Transport modules'}
-                        </caption>
-                        <thead>
-                            <tr>
-                               <th>{intl l="Name"}</th>
-                               <th>{intl l="Description"}</th>
-                               <th>{intl l="Enable/Disable"}</th>
+                    <div class="table-responsive">
+                        <table class="table table-striped table-condensed table-left-aligned">
+                            <caption class="clearfix">
+                               {intl l='Transport modules'}
+                            </caption>
+                            <thead>
+                                <tr>
+                                   <th>{intl l="Name"}</th>
+                                   <th>{intl l="Description"}</th>
+                                   <th>{intl l="Enable/Disable"}</th>
 
-                               {module_include location='modules_table_header'}
+                                   {module_include location='modules_table_header'}
 
-                               <th class="actions">{intl l="Actions"}</th>
-                            </tr>
-                        </thead>
+                                   <th class="actions">{intl l="Actions"}</th>
+                                </tr>
+                            </thead>
 
-                        <tbody>
-                            <tr>
-                                <td><a href="">Tinymce</a></td>                                    
-                                <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid! Eius, pariatur accusantium odit quidem laboriosam.</td>                                    
-                                <td>
-                                    <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
-                                        <input type="checkbox" checked>
-                                    </div>
-                                </td>
+                            <tbody>
+                                <tr>
+                                    <td><a href="">Tinymce</a></td>                                    
+                                    <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid! Eius, pariatur accusantium odit quidem laboriosam.</td>                                    
+                                    <td>
+                                        <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
+                                            <input type="checkbox" checked>
+                                        </div>
+                                    </td>
 
-                                {module_include location='modules_table_row'}
+                                    {module_include location='modules_table_row'}
 
-                                <td>
-                                    <div class="btn-group">
-                                        
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
-                                           <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
-                                        {/loop}
+                                    <td>
+                                        <div class="btn-group">
+                                            
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
+                                               <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
+                                            {/loop}
 
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
-                                           <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
-                                        {/loop}                                                                                                                
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
+                                               <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
+                                            {/loop}                                                                                                                
 
-                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
-                                           <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-                                        {/loop}
-                                    </div>
-                                </td>
-                            </tr>                                
-                            <tr>
-                                <td><a href="">So colissimo</a></td>                                    
-                                <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid</td>                                    
-                                <td>
-                                    <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
-                                        <input type="checkbox">
-                                    </div>
-                                </td>
+                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
+                                               <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+                                            {/loop}
+                                        </div>
+                                    </td>
+                                </tr>                                
+                                <tr>
+                                    <td><a href="">So colissimo</a></td>                                    
+                                    <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid</td>                                    
+                                    <td>
+                                        <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
+                                            <input type="checkbox">
+                                        </div>
+                                    </td>
 
-                                {module_include location='modules_table_row'}
+                                    {module_include location='modules_table_row'}
 
-                                <td>
-                                    <div class="btn-group">
-                                        
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
-                                           <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
-                                        {/loop}
+                                    <td>
+                                        <div class="btn-group">
+                                            
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
+                                               <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
+                                            {/loop}
 
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
-                                           <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
-                                        {/loop}                                                                                                                
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
+                                               <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
+                                            {/loop}                                                                                                                
 
-                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
-                                           <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-                                        {/loop}
-                                    </div>
-                                </td>
-                            </tr>                                
-                            <tr>
-                                <td><a href="">Title meta</a></td>                                    
-                                <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid</td>                                    
-                                <td>
-                                    <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
-                                        <input type="checkbox">
-                                    </div>
-                                </td>
+                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
+                                               <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+                                            {/loop}
+                                        </div>
+                                    </td>
+                                </tr>                                
+                                <tr>
+                                    <td><a href="">Title meta</a></td>                                    
+                                    <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid</td>                                    
+                                    <td>
+                                        <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
+                                            <input type="checkbox">
+                                        </div>
+                                    </td>
 
-                                {module_include location='modules_table_row'}
+                                    {module_include location='modules_table_row'}
 
-                                <td>
-                                    <div class="btn-group">
-                                        
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
-                                           <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
-                                        {/loop}
+                                    <td>
+                                        <div class="btn-group">
+                                            
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
+                                               <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
+                                            {/loop}
 
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
-                                           <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
-                                        {/loop}                                                                                                                
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
+                                               <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
+                                            {/loop}                                                                                                                
 
-                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
-                                           <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-                                        {/loop}
-                                    </div>
-                                </td>
-                            </tr>                                
-                        </tbody>
-                    </table>
+                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
+                                               <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+                                            {/loop}
+                                        </div>
+                                    </td>
+                                </tr>                                
+                            </tbody>
+                        </table>
+                    </div>
                 </div>                
 
                 <div class="general-block-decorator">
-                    <table class="table table-striped table-condensed table-left-aligned">
-                        <caption class="clearfix">
-                           {intl l='Delivery modules'}
-                        </caption>
-                        <thead>
-                            <tr>
-                               <th>{intl l="Name"}</th>
-                               <th>{intl l="Description"}</th>
-                               <th>{intl l="Enable/Disable"}</th>
+                    <div class="table-responsive">
+                        <table class="table table-striped table-condensed table-left-aligned">
+                            <caption class="clearfix">
+                               {intl l='Delivery modules'}
+                            </caption>
+                            <thead>
+                                <tr>
+                                   <th>{intl l="Name"}</th>
+                                   <th>{intl l="Description"}</th>
+                                   <th>{intl l="Enable/Disable"}</th>
 
-                               {module_include location='modules_table_header'}
+                                   {module_include location='modules_table_header'}
 
-                               <th class="actions">{intl l="Actions"}</th>
-                            </tr>
-                        </thead>
+                                   <th class="actions">{intl l="Actions"}</th>
+                                </tr>
+                            </thead>
 
-                        <tbody>
-                            <tr>
-                                <td><a href="">Tinymce</a></td>                                    
-                                <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid! Eius, pariatur accusantium odit quidem laboriosam.</td>                                    
-                                <td>
-                                    <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
-                                        <input type="checkbox" checked>
-                                    </div>
-                                </td>
+                            <tbody>
+                                <tr>
+                                    <td><a href="">Tinymce</a></td>                                    
+                                    <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid! Eius, pariatur accusantium odit quidem laboriosam.</td>                                    
+                                    <td>
+                                        <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
+                                            <input type="checkbox" checked>
+                                        </div>
+                                    </td>
 
-                                {module_include location='modules_table_row'}
+                                    {module_include location='modules_table_row'}
 
-                                <td>
-                                    <div class="btn-group">
-                                        
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
-                                           <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
-                                        {/loop}
+                                    <td>
+                                        <div class="btn-group">
+                                            
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
+                                               <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
+                                            {/loop}
 
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
-                                           <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
-                                        {/loop}                                                                                                                
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
+                                               <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
+                                            {/loop}                                                                                                                
 
-                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
-                                           <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-                                        {/loop}
-                                    </div>
-                                </td>
-                            </tr>                                
-                            <tr>
-                                <td><a href="">So colissimo</a></td>                                    
-                                <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid</td>                                    
-                                <td>
-                                    <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
-                                        <input type="checkbox">
-                                    </div>
-                                </td>
+                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
+                                               <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+                                            {/loop}
+                                        </div>
+                                    </td>
+                                </tr>                                
+                                <tr>
+                                    <td><a href="">So colissimo</a></td>                                    
+                                    <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid</td>                                    
+                                    <td>
+                                        <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
+                                            <input type="checkbox">
+                                        </div>
+                                    </td>
 
-                                {module_include location='modules_table_row'}
+                                    {module_include location='modules_table_row'}
 
-                                <td>
-                                    <div class="btn-group">
-                                        
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
-                                           <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
-                                        {/loop}
+                                    <td>
+                                        <div class="btn-group">
+                                            
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
+                                               <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
+                                            {/loop}
 
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
-                                           <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
-                                        {/loop}                                                                                                                
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
+                                               <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
+                                            {/loop}                                                                                                                
 
-                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
-                                           <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-                                        {/loop}
-                                    </div>
-                                </td>
-                            </tr>                                
-                            <tr>
-                                <td><a href="">Title meta</a></td>                                    
-                                <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid</td>                                    
-                                <td>
-                                    <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
-                                        <input type="checkbox">
-                                    </div>
-                                </td>
+                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
+                                               <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+                                            {/loop}
+                                        </div>
+                                    </td>
+                                </tr>                                
+                                <tr>
+                                    <td><a href="">Title meta</a></td>                                    
+                                    <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid</td>                                    
+                                    <td>
+                                        <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
+                                            <input type="checkbox">
+                                        </div>
+                                    </td>
 
-                                {module_include location='modules_table_row'}
+                                    {module_include location='modules_table_row'}
 
-                                <td>
-                                    <div class="btn-group">
-                                        
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
-                                           <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
-                                        {/loop}
+                                    <td>
+                                        <div class="btn-group">
+                                            
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
+                                               <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
+                                            {/loop}
 
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
-                                           <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
-                                        {/loop}                                                                                                                
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
+                                               <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
+                                            {/loop}                                                                                                                
 
-                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
-                                           <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-                                        {/loop}
-                                    </div>
-                                </td>
-                            </tr>                                
-                        </tbody>
-                    </table>
+                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
+                                               <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+                                            {/loop}
+                                        </div>
+                                    </td>
+                                </tr>                                
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/templates/admin/default/order-edit.html b/templates/admin/default/order-edit.html
index 603176fe6..793414afb 100644
--- a/templates/admin/default/order-edit.html
+++ b/templates/admin/default/order-edit.html
@@ -30,71 +30,75 @@
 						
 						<div class="tab-content">
 							<div class="tab-pane fade active in" id="cart">
-								<table class="table table-striped table-condensed table-left-aligned">
-			                        <caption class="clearfix">
-			                           {intl l='Information about order 01201303540354'}	                           
-			                        </caption>
-		                            <thead>
-		    	                        <tr>
-		    	                           <th>{intl l="Designation"}</th>
-		                                   <th>{intl l="Price"}</th>
-		                                   <th>{intl l="Quantity"}</th>
-		                                   <th>{intl l="Total"}</th>                                   
-		    	                        </tr>
-		                            </thead>
+								<div class="table-responsive">
+									<table class="table table-striped table-condensed table-left-aligned">
+				                        <caption class="clearfix">
+				                           {intl l='Information about order 01201303540354'}	                           
+				                        </caption>
+			                            <thead>
+			    	                        <tr>
+			    	                           <th>{intl l="Designation"}</th>
+			                                   <th>{intl l="Price"}</th>
+			                                   <th>{intl l="Quantity"}</th>
+			                                   <th>{intl l="Total"}</th>                                   
+			    	                        </tr>
+			                            </thead>
 
-		                            <tbody>    	                        
-		    	                    	<tr>
-		    	                    		<td><a href="#">T-Shirt F T1</a></td>
-		    	                    		<td>20.00 &euro;</td>
-		    	                    		<td>3</td>
-		    	                    		<td>60.00 &euro;</td>
-		    	                    	</tr>
-		    	                    	<tr>
-		    	                    		<td><a href="#">T-Shirt F T1</a></td>
-		    	                    		<td>20.00 &euro;</td>
-		    	                    		<td>3</td>
-		    	                    		<td>60.00 &euro;</td>
-		    	                    	</tr>
-		    	                    	<tr>
-		    	                    		<td><a href="#">T-Shirt F T1</a></td>
-		    	                    		<td>20.00 &euro;</td>
-		    	                    		<td>3</td>
-		    	                    		<td>60.00 &euro;</td>
-		    	                    	</tr>
-		                            </tbody>
-		                            <tfoot>
-		                            	<tr class="active">
-		                            		<td colspan="3"><strong>Total</strong></td>
-		                            		<td><strong>180.00 &euro;</strong></td>
-		                            	</tr>
-		                            </tfoot>
-			                    </table>
+			                            <tbody>    	                        
+			    	                    	<tr>
+			    	                    		<td><a href="#">T-Shirt F T1</a></td>
+			    	                    		<td>20.00 &euro;</td>
+			    	                    		<td>3</td>
+			    	                    		<td>60.00 &euro;</td>
+			    	                    	</tr>
+			    	                    	<tr>
+			    	                    		<td><a href="#">T-Shirt F T1</a></td>
+			    	                    		<td>20.00 &euro;</td>
+			    	                    		<td>3</td>
+			    	                    		<td>60.00 &euro;</td>
+			    	                    	</tr>
+			    	                    	<tr>
+			    	                    		<td><a href="#">T-Shirt F T1</a></td>
+			    	                    		<td>20.00 &euro;</td>
+			    	                    		<td>3</td>
+			    	                    		<td>60.00 &euro;</td>
+			    	                    	</tr>
+			                            </tbody>
+			                            <tfoot>
+			                            	<tr class="active">
+			                            		<td colspan="3"><strong>Total</strong></td>
+			                            		<td><strong>180.00 &euro;</strong></td>
+			                            	</tr>
+			                            </tfoot>
+				                    </table>
+				                </div>
 			                </div> <!-- #cart -->
 
 			                <div class="tab-pane fade" id="bill">
-			                	<table class="table table-striped table-condensed table-left-aligned">
-			                        <caption>
-			                           {intl l='Information about the bill'}		                                                           
-			                        </caption>
-		                            <thead>
-		    	                        <tr>
-		    	                           <th>{intl l="Bill n°"}</th>
-		                                   <th>{intl l="Compagny"}</th>
-		                                   <th>{intl l="Firstname & Lastname"}</th>
-		                                   <th>{intl l="Date & Hour"}</th>
-		    	                        </tr>
-		                            </thead>
+			                	<div class="table-responsive">
+				                	<table class="table table-striped table-condensed table-left-aligned">
+				                        <caption>
+				                           {intl l='Information about the bill'}		                                                           
+				                        </caption>
+			                            <thead>
+			    	                        <tr>
+			    	                           <th>{intl l="Bill n°"}</th>
+			                                   <th>{intl l="Compagny"}</th>
+			                                   <th>{intl l="Firstname & Lastname"}</th>
+			                                   <th>{intl l="Date & Hour"}</th>
+			    	                        </tr>
+			                            </thead>
 
-		                            <tbody>    	                        
-		    	                    	<tr>
-		    	                    		<td><a href="#">0001</a></td>
-		    	                    		<td>Thelia</td>
-		    	                    		<td>Dupont Jean</td>
-		    	                    		<td>11/01/2013 14:11:00</td>
-		    	                    	</tr>		    	                    	
-		                            </tbody>
-			                    </table>
+			                            <tbody>    	                        
+			    	                    	<tr>
+			    	                    		<td><a href="#">0001</a></td>
+			    	                    		<td>Thelia</td>
+			    	                    		<td>Dupont Jean</td>
+			    	                    		<td>11/01/2013 14:11:00</td>
+			    	                    	</tr>		    	                    	
+			                            </tbody>
+				                    </table>
+				                </div>
 							</div> <!-- #bill -->
 
 							<div class="tab-pane fade" id="carriage">
@@ -116,214 +120,219 @@
 							</div> <!-- #carriage -->
 
 							<div class="tab-pane fade" id="settlement">
-			                	
-			                	<table class="table table-striped table-condensed table-left-aligned">
-			                        <caption class="clearfix">
-			                        	{intl l='Information about the settlement'}
-			                        </caption>
-			                        <tbody>
-			                        	<tr>
-			                        		<th>{intl l="Type of payment"}</th>
-			                        		<td>Unknown</td>
-			                        	</tr>
-			                        	<tr>
-			                        		<th>{intl l="Transaction reference"}</th>
-			                        		<td>141100</td>
-			                        	</tr>
-			                        	<tr>
-			                        		<th>{intl l="Total order before discount"}</th>
-			                        		<td>60 &euro;</td>
-			                        	</tr>
-			                        	<tr>
-			                        		<th>{intl l="Discount"}</th>
-			                        		<td>10%</td>
-			                        	</tr>
-			                        	<tr>
-			                        		<th>{intl l="Coupon code"}</th>
-			                        		<td></td>
-			                        	</tr>
-			                        	<tr>
-			                        		<th>{intl l="Total with discount"}</th>
-			                        		<td>50 &euro;</td>
-			                        	</tr>
-			                        	<tr>
-			                        		<th>{intl l="Freight"}</th>
-			                        		<td>6 &euro;</td>
-			                        	</tr>
-			                        	<tr>
-			                        		<th>{intl l="Total"}</th>
-			                        		<td>56 &euro;</td>
-			                        	</tr>
-			                        </tbody>
-								</table>
-			                    	                    
+			                	<div class="table-responsive">
+				                	<table class="table table-striped table-condensed table-left-aligned">
+				                        <caption class="clearfix">
+				                        	{intl l='Information about the settlement'}
+				                        </caption>
+				                        <tbody>
+				                        	<tr>
+				                        		<th>{intl l="Type of payment"}</th>
+				                        		<td>Unknown</td>
+				                        	</tr>
+				                        	<tr>
+				                        		<th>{intl l="Transaction reference"}</th>
+				                        		<td>141100</td>
+				                        	</tr>
+				                        	<tr>
+				                        		<th>{intl l="Total order before discount"}</th>
+				                        		<td>60 &euro;</td>
+				                        	</tr>
+				                        	<tr>
+				                        		<th>{intl l="Discount"}</th>
+				                        		<td>10%</td>
+				                        	</tr>
+				                        	<tr>
+				                        		<th>{intl l="Coupon code"}</th>
+				                        		<td></td>
+				                        	</tr>
+				                        	<tr>
+				                        		<th>{intl l="Total with discount"}</th>
+				                        		<td>50 &euro;</td>
+				                        	</tr>
+				                        	<tr>
+				                        		<th>{intl l="Freight"}</th>
+				                        		<td>6 &euro;</td>
+				                        	</tr>
+				                        	<tr>
+				                        		<th>{intl l="Total"}</th>
+				                        		<td>56 &euro;</td>
+				                        	</tr>
+				                        </tbody>
+									</table>
+			                   	</div>           
 							</div> <!-- #settlement -->
 
 							<div class="tab-pane fade clearfix" id="address">
 			                	
 			                	<div class="col-md-6">
-				                	<table class="table table-striped table-condensed table-left-aligned">
-				                        <caption class="clearfix">
-				                        	{intl l='Billing address'}
-				                        	<a class="btn btn-default btn-primary pull-right" title="{intl l='Edit this billing address'}" href="#edit_address_dialog" data-toggle="modal">
-			                                    <span class="glyphicon glyphicon-edit"></span>
-			                                </a>
-				                        </caption>
-				                        <tbody>
-				                        	<tr>
-				                        		<th>{intl l="Title"}</th>
-				                        		<td>Mr</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="Compagny"}</th>
-				                        		<td>Thelia</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="Firstname"}</th>
-				                        		<td>Espeche</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="Lastname"}</th>
-				                        		<td>Michaël</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="Street address"}</th>
-				                        		<td>5, rue Rochon</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="Additional address"}</th>
-				                        		<td>Lorem ipsum dolor sit amet</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="Additional address"}</th>
-				                        		<td>Lorem ipsum dolor sit</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="Zip code"}</th>
-				                        		<td>63000</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="City"}</th>
-				                        		<td>Clermont-Fd</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="Country"}</th>
-				                        		<td>France</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="Phone"}</th>
-				                        		<td>01 02 03 04 05</td>
-				                        	</tr>
-				                        </tbody>
-									</table>
+			                		<div class="table-responsive">
+					                	<table class="table table-striped table-condensed table-left-aligned">
+					                        <caption class="clearfix">
+					                        	{intl l='Billing address'}
+					                        	<a class="btn btn-default btn-primary pull-right" title="{intl l='Edit this billing address'}" href="#edit_address_dialog" data-toggle="modal">
+				                                    <span class="glyphicon glyphicon-edit"></span>
+				                                </a>
+					                        </caption>
+					                        <tbody>
+					                        	<tr>
+					                        		<th>{intl l="Title"}</th>
+					                        		<td>Mr</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="Compagny"}</th>
+					                        		<td>Thelia</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="Firstname"}</th>
+					                        		<td>Espeche</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="Lastname"}</th>
+					                        		<td>Michaël</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="Street address"}</th>
+					                        		<td>5, rue Rochon</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="Additional address"}</th>
+					                        		<td>Lorem ipsum dolor sit amet</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="Additional address"}</th>
+					                        		<td>Lorem ipsum dolor sit</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="Zip code"}</th>
+					                        		<td>63000</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="City"}</th>
+					                        		<td>Clermont-Fd</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="Country"}</th>
+					                        		<td>France</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="Phone"}</th>
+					                        		<td>01 02 03 04 05</td>
+					                        	</tr>
+					                        </tbody>
+										</table>
+									</div>
 								</div>
 
 								<div class="col-md-6">
-				                	<table class="table table-striped table-condensed table-left-aligned">
-				                        <caption class="clearfix">
-				                        	{intl l='Delivery address'}
-				                        	<a class="btn btn-default btn-primary pull-right" title="{intl l='Edit this delivery address'}" href="#edit_address_dialog" data-toggle="modal">
-			                                    <span class="glyphicon glyphicon-edit"></span>
-			                                </a>
-				                        </caption>
-				                        <tbody>
-				                        	<tr>
-				                        		<th>{intl l="Title"}</th>
-				                        		<td>Mr</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="Compagny"}</th>
-				                        		<td>Thelia</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="Firstname"}</th>
-				                        		<td>Espeche</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="Lastname"}</th>
-				                        		<td>Michaël</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="Street address"}</th>
-				                        		<td>5, rue Rochon</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="Additional address"}</th>
-				                        		<td>Lorem ipsum dolor sit amet</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="Additional address"}</th>
-				                        		<td>Lorem ipsum dolor sit</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="Zip code"}</th>
-				                        		<td>63000</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="City"}</th>
-				                        		<td>Clermont-Fd</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="Country"}</th>
-				                        		<td>France</td>
-				                        	</tr>
-				                        	<tr>
-				                        		<th>{intl l="Phone"}</th>
-				                        		<td>01 02 03 04 05</td>
-				                        	</tr>
-				                        </tbody>
-									</table>
+									<div class="table-responsive">
+					                	<table class="table table-striped table-condensed table-left-aligned">
+					                        <caption class="clearfix">
+					                        	{intl l='Delivery address'}
+					                        	<a class="btn btn-default btn-primary pull-right" title="{intl l='Edit this delivery address'}" href="#edit_address_dialog" data-toggle="modal">
+				                                    <span class="glyphicon glyphicon-edit"></span>
+				                                </a>
+					                        </caption>
+					                        <tbody>
+					                        	<tr>
+					                        		<th>{intl l="Title"}</th>
+					                        		<td>Mr</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="Compagny"}</th>
+					                        		<td>Thelia</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="Firstname"}</th>
+					                        		<td>Espeche</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="Lastname"}</th>
+					                        		<td>Michaël</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="Street address"}</th>
+					                        		<td>5, rue Rochon</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="Additional address"}</th>
+					                        		<td>Lorem ipsum dolor sit amet</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="Additional address"}</th>
+					                        		<td>Lorem ipsum dolor sit</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="Zip code"}</th>
+					                        		<td>63000</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="City"}</th>
+					                        		<td>Clermont-Fd</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="Country"}</th>
+					                        		<td>France</td>
+					                        	</tr>
+					                        	<tr>
+					                        		<th>{intl l="Phone"}</th>
+					                        		<td>01 02 03 04 05</td>
+					                        	</tr>
+					                        </tbody>
+										</table>
+									</div>
 								</div>
 			                    	                    
 							</div> <!-- #address -->
 							
 							<div class="tab-pane fade clearfix" id="supplements">
-								<table class="table table-striped table-condensed table-left-aligned">
-			                        <caption>
-			                        	{intl l='Further information'}
-			                        </caption>
-			                        
-			                        <tbody>
-			                        	<tr>			                        		
-			                        		<th><label for="">{intl l='Status'}</label></th>
-			                        		<td>
-			                        			<form action="" method="">
-				                        			<div class="row">
-	  													<div class="col-lg-4">
-						                        			<select name="" id="" class="form-control">
-						                        				<option value="">Status 1</option>
-						                        				<option value="">Status 2</option>
-						                        				<option value="">Status 3</option>
-						                        			</select>
-						                        		</div>
-						                        	</div>
-						                        </form>
-			                        		</td>			                        		
-			                        	</tr>
-			                        	<tr>			                        		
-			                        		<th><label for="">{intl l='Order Tracking'}</label></th>
-			                        		<td>				 
-				                        		<form action="" method="">                       			
-										            <div class="row">
-	  													<div class="col-lg-4">
-											            	<input type="text" id="" name="" class="form-control" value="" title="" placeholder="">
-											           	</div>
-											           	<button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-ok"></span></button>
-										           	</div>				
-										        </form>						            
-			                        		</td>				                        	
-			                        	</tr>
-			                        	<tr>
-											<th>{intl l='Bill'}</th>
-											<td><a href="#" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-cloud-download"></span> {intl l='Download bill to pdf'}</a></td>
-			                        	</tr>
-			                        	<tr>
-											<th>{intl l='Delivery'}</th>
-											<td><a href="#" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-cloud-download"></span> {intl l='Download delivery to pdf'}</a></td>
-			                        	</tr>
-			                        </tbody>				                        										 
-				                    
-		                        </table>
+								<div class="table-responsive">
+									<table class="table table-striped table-condensed table-left-aligned">
+				                        <caption>
+				                        	{intl l='Further information'}
+				                        </caption>
+				                        
+				                        <tbody>
+				                        	<tr>			                        		
+				                        		<th><label for="">{intl l='Status'}</label></th>
+				                        		<td>
+				                        			<form action="" method="">
+					                        			<div class="row">
+		  													<div class="col-lg-4">
+							                        			<select name="" id="" class="form-control">
+							                        				<option value="">Status 1</option>
+							                        				<option value="">Status 2</option>
+							                        				<option value="">Status 3</option>
+							                        			</select>
+							                        		</div>
+							                        	</div>
+							                        </form>
+				                        		</td>			                        		
+				                        	</tr>
+				                        	<tr>			                        		
+				                        		<th><label for="">{intl l='Order Tracking'}</label></th>
+				                        		<td>				 
+					                        		<form action="" method="">                       			
+											            <div class="row">
+		  													<div class="col-lg-4">
+												            	<input type="text" id="" name="" class="form-control" value="" title="" placeholder="">
+												           	</div>
+												           	<button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-ok"></span></button>
+											           	</div>				
+											        </form>						            
+				                        		</td>				                        	
+				                        	</tr>
+				                        	<tr>
+												<th>{intl l='Bill'}</th>
+												<td><a href="#" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-cloud-download"></span> {intl l='Download bill to pdf'}</a></td>
+				                        	</tr>
+				                        	<tr>
+												<th>{intl l='Delivery'}</th>
+												<td><a href="#" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-cloud-download"></span> {intl l='Download delivery to pdf'}</a></td>
+				                        	</tr>
+				                        </tbody>				                        										 				                    
+			                        </table>
+			                    </div>
 		                    </div> <!-- #supplements -->
 
 			            </div>
diff --git a/templates/admin/default/orders.html b/templates/admin/default/orders.html
index dcf9ef7e3..02bbea458 100644
--- a/templates/admin/default/orders.html
+++ b/templates/admin/default/orders.html
@@ -19,114 +19,116 @@
         <div class="row">
             <div class="col-md-12">
                 <div class="general-block-decorator">
-                    <table class="table table-striped table-condensed table-left-aligned">
-                        <caption class="clearfix">
-                           {intl l='Orders'}
-                           {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.orders.create"}
-                                <a class="btn btn-default btn-primary pull-right" title="{intl l='Create an order'}" href="#creation_dialog">
-                                    <span class="glyphicon glyphicon-plus-sign"></span>
-                                </a>
-                        	{/loop}
-                        </caption>
-                        <thead>
-	                        <tr>
-	                           <th>{intl l="Order n°"}</th>
-                               <th>{intl l="Date & Hour"}</th>
-                               <th>{intl l="Compagny"}</th>
-                               <th>{intl l="Name"}</th>
-                               <th>{intl l="Amount"}</th>
-                               <th>{intl l="Status"}</th>
+                	<div class="table-responsive">
+	                    <table class="table table-striped table-condensed table-left-aligned">
+	                        <caption class="clearfix">
+	                           {intl l='Orders'}
+	                           {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.orders.create"}
+	                                <a class="btn btn-default btn-primary pull-right" title="{intl l='Create an order'}" href="#creation_dialog">
+	                                    <span class="glyphicon glyphicon-plus-sign"></span>
+	                                </a>
+	                        	{/loop}
+	                        </caption>
+	                        <thead>
+		                        <tr>
+		                           <th>{intl l="Order n°"}</th>
+	                               <th>{intl l="Date & Hour"}</th>
+	                               <th>{intl l="Compagny"}</th>
+	                               <th>{intl l="Name"}</th>
+	                               <th>{intl l="Amount"}</th>
+	                               <th>{intl l="Status"}</th>
 
-                               {module_include location='orders_table_header'}
+	                               {module_include location='orders_table_header'}
 
-                               <th class="actions">{intl l="Actions"}</th>
-	                        </tr>
-                        </thead>
+	                               <th class="actions">{intl l="Actions"}</th>
+		                        </tr>
+	                        </thead>
 
-                        <tbody>
-	                            <tr>
+	                        <tbody>
+		                            <tr>
 
-	                               	<td><a href="">01230450123045</a></td>
-	                               	<td>11/09/2013 10:24:31</td>
-	                               	<td>Thelia</td>
-	                               	<td><a href="">Dupont</a></td>
-	                               	<td>251 &euro;</td>
-	                               	<td><span class="label label-success">Paid</span></td>
+		                               	<td><a href="">01230450123045</a></td>
+		                               	<td>11/09/2013 10:24:31</td>
+		                               	<td>Thelia</td>
+		                               	<td><a href="">Dupont</a></td>
+		                               	<td>251 &euro;</td>
+		                               	<td><span class="label label-success">Paid</span></td>
 
-	                                {module_include location='orders_table_row'}
+		                                {module_include location='orders_table_row'}
 
-	                                <td>
-	                                    <div class="btn-group">
+		                                <td>
+		                                    <div class="btn-group">
 
-			                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.orders.edit"}
-			                                   <a class="btn btn-default btn-xs" title="{intl l='Edit this order'}" href="{url path="/admin/order/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
-			                                {/loop}
+				                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.orders.edit"}
+				                                   <a class="btn btn-default btn-xs" title="{intl l='Edit this order'}" href="{url path="/admin/order/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
+				                                {/loop}
 
-			                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.orders.delete"}
-			                                   <a class="btn btn-default btn-xs" title="{intl l='Delete this order'}"  href="#delete_order_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-			                                {/loop}
-			                            </div>
-	                                </td>
-	                            </tr>
-	                            <tr>
+				                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.orders.delete"}
+				                                   <a class="btn btn-default btn-xs" title="{intl l='Delete this order'}"  href="#delete_order_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+				                                {/loop}
+				                            </div>
+		                                </td>
+		                            </tr>
+		                            <tr>
 
-	                               	<td><a href="">01230450123045</a></td>
-	                               	<td>11/09/2013 10:24:31</td>
-	                               	<td>Thelia</td>
-	                               	<td><a href="">Dupont</a></td>
-	                               	<td>251 &euro;</td>
-	                               	<td><span class="label label-danger">Canceled</span></td>
+		                               	<td><a href="">01230450123045</a></td>
+		                               	<td>11/09/2013 10:24:31</td>
+		                               	<td>Thelia</td>
+		                               	<td><a href="">Dupont</a></td>
+		                               	<td>251 &euro;</td>
+		                               	<td><span class="label label-danger">Canceled</span></td>
 
-	                                {module_include location='orders_table_row'}
+		                                {module_include location='orders_table_row'}
 
-	                                <td>
-	                                    <div class="btn-group">
+		                                <td>
+		                                    <div class="btn-group">
 
-			                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.orders.edit"}
-			                                   <a class="btn btn-default btn-xs" title="{intl l='Edit this order'}" href="{url path="/admin/order/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
-			                                {/loop}
+				                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.orders.edit"}
+				                                   <a class="btn btn-default btn-xs" title="{intl l='Edit this order'}" href="{url path="/admin/order/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
+				                                {/loop}
 
-			                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.orders.delete"}
-			                                   <a class="btn btn-default btn-xs" title="{intl l='Delete this order'}"  href="#delete_order_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-			                                {/loop}
-			                            </div>
-	                                </td>
-	                            </tr>
-	                            <tr>
+				                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.orders.delete"}
+				                                   <a class="btn btn-default btn-xs" title="{intl l='Delete this order'}"  href="#delete_order_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+				                                {/loop}
+				                            </div>
+		                                </td>
+		                            </tr>
+		                            <tr>
 
-	                               	<td><a href="">01230450123045</a></td>
-	                               	<td>11/09/2013 10:24:31</td>
-	                               	<td>Thelia</td>
-	                               	<td><a href="">Dupont</a></td>
-	                               	<td>251 &euro;</td>
-	                               	<td><span class="label label-info">Current</span></td>
+		                               	<td><a href="">01230450123045</a></td>
+		                               	<td>11/09/2013 10:24:31</td>
+		                               	<td>Thelia</td>
+		                               	<td><a href="">Dupont</a></td>
+		                               	<td>251 &euro;</td>
+		                               	<td><span class="label label-info">Current</span></td>
 
-	                                {module_include location='orders_table_row'}
+		                                {module_include location='orders_table_row'}
 
-	                                <td>
-	                                    <div class="btn-group">
+		                                <td>
+		                                    <div class="btn-group">
 
-			                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.orders.edit"}
-			                                   <a class="btn btn-default btn-xs" title="{intl l='Edit this order'}" href="{url path="/admin/order/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
-			                                {/loop}
+				                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.orders.edit"}
+				                                   <a class="btn btn-default btn-xs" title="{intl l='Edit this order'}" href="{url path="/admin/order/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
+				                                {/loop}
 
-			                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.orders.delete"}
-			                                   <a class="btn btn-default btn-xs" title="{intl l='Delete this order'}"  href="#delete_order_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-			                                {/loop}
-			                            </div>
-	                                </td>
-	                            </tr>
+				                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.orders.delete"}
+				                                   <a class="btn btn-default btn-xs" title="{intl l='Delete this order'}"  href="#delete_order_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+				                                {/loop}
+				                            </div>
+		                                </td>
+		                            </tr>
 
-	                        <!-- <tr>
-	                           <td colspan="3">
-	                               <div class="alert alert-info">
-	                               {intl l="No mailing template has been created yet. Click the + button to create one."}
-	                               </div>
-	                           </td>
-	                        </tr> -->
+		                        <!-- <tr>
+		                           <td colspan="3">
+		                               <div class="alert alert-info">
+		                               {intl l="No mailing template has been created yet. Click the + button to create one."}
+		                               </div>
+		                           </td>
+		                        </tr> -->
 
-                        </tbody>
-                    </table>
+	                        </tbody>
+	                    </table>
+	                </div>
                 </div>
             </div>
         </div>
diff --git a/templates/admin/default/shipping-configuration-edit.html b/templates/admin/default/shipping-configuration-edit.html
index 39b69dcde..b17dc6de4 100644
--- a/templates/admin/default/shipping-configuration-edit.html
+++ b/templates/admin/default/shipping-configuration-edit.html
@@ -48,56 +48,58 @@
                         </div>
 
                         <div class="col-md-8">
-                            <table class="table table-striped table-condensed">
-                                <thead>
-                                    <tr>
-                                        <th>{intl l="Country"}</th>
-                                        <th>{intl l="Actions"}</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr>
-                                        <td>Wallis-et-Futuna</td>
-                                        <td>
-                                            <a class="btn btn-default btn-xs" title="{intl l='Delete this country'}"  href="#delete_country_dialog" data-id="{$ID}" data-toggle="modal">
-                                                <span class="glyphicon glyphicon-trash"></span>
-                                            </a>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>Polynésie française</td>
-                                        <td>
-                                            <a class="btn btn-default btn-xs" title="{intl l='Delete this country'}"  href="#delete_country_dialog" data-id="{$ID}" data-toggle="modal">
-                                                <span class="glyphicon glyphicon-trash"></span>
-                                            </a>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>USA - Alabama</td>
-                                        <td>
-                                            <a class="btn btn-default btn-xs" title="{intl l='Delete this country'}"  href="#delete_zone_dialog" data-id="{$ID}" data-toggle="modal">
-                                                <span class="glyphicon glyphicon-trash"></span>
-                                            </a>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                                <tfoot>
-                                    <tr class="active">
-                                        <td colspan="2">
-                                            <form method="POST" action="">
-                                                <label for="" class="control-label">{intl l="Freight"}</label>
-                                                <div class="input-group">
-                                                    <input type="text" class="form-control" name="" id="" placeholder="Freight value">
-                                                    <span class="input-group-addon">&euro;</span>
-                                                    <span class="input-group-btn">
-                                                        <button type="submit" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-check"></span></button>
-                                                    </span>
-                                                </div>
-                                            </form>
-                                        </td>
-                                    </tr>
-                                </tfoot>
-                            </table>
+                            <div class="table-responsive">
+                                <table class="table table-striped table-condensed">
+                                    <thead>
+                                        <tr>
+                                            <th>{intl l="Country"}</th>
+                                            <th>{intl l="Actions"}</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <tr>
+                                            <td>Wallis-et-Futuna</td>
+                                            <td>
+                                                <a class="btn btn-default btn-xs" title="{intl l='Delete this country'}"  href="#delete_country_dialog" data-id="{$ID}" data-toggle="modal">
+                                                    <span class="glyphicon glyphicon-trash"></span>
+                                                </a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>Polynésie française</td>
+                                            <td>
+                                                <a class="btn btn-default btn-xs" title="{intl l='Delete this country'}"  href="#delete_country_dialog" data-id="{$ID}" data-toggle="modal">
+                                                    <span class="glyphicon glyphicon-trash"></span>
+                                                </a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>USA - Alabama</td>
+                                            <td>
+                                                <a class="btn btn-default btn-xs" title="{intl l='Delete this country'}"  href="#delete_zone_dialog" data-id="{$ID}" data-toggle="modal">
+                                                    <span class="glyphicon glyphicon-trash"></span>
+                                                </a>
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                    <tfoot>
+                                        <tr class="active">
+                                            <td colspan="2">
+                                                <form method="POST" action="">
+                                                    <label for="" class="control-label">{intl l="Freight"}</label>
+                                                    <div class="input-group">
+                                                        <input type="text" class="form-control" name="" id="" placeholder="Freight value">
+                                                        <span class="input-group-addon">&euro;</span>
+                                                        <span class="input-group-btn">
+                                                            <button type="submit" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-check"></span></button>
+                                                        </span>
+                                                    </div>
+                                                </form>
+                                            </td>
+                                        </tr>
+                                    </tfoot>
+                                </table>
+                            </div>
                         </div>
                     </div>
                     
diff --git a/templates/admin/default/shipping-configuration.html b/templates/admin/default/shipping-configuration.html
index ae9090c70..067256d5f 100644
--- a/templates/admin/default/shipping-configuration.html
+++ b/templates/admin/default/shipping-configuration.html
@@ -20,88 +20,90 @@
         <div class="row">
             <div class="col-md-12">
                 <div class="general-block-decorator">
-                    <table class="table table-striped table-condensed table-left-aligned">
-                        <caption class="clearfix">
-                            {intl l='Thelia Shipping configuration'}
-                            {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.shipping-configuration.create"}
-                            <a class="btn btn-default btn-primary pull-right" title="{intl l='Add a new shipping configuration'}" href="#creation_dialog" data-toggle="modal">
-                                <span class="glyphicon glyphicon-plus-sign"></span>
-                            </a>
-                            {/loop}                        
-                        </caption>
-                        <thead>
-	                        <tr>	                           
-                               <th>{intl l="Description"}</th>
+                    <div class="table-responsive">
+                        <table class="table table-striped table-condensed table-left-aligned">
+                            <caption class="clearfix">
+                                {intl l='Thelia Shipping configuration'}
+                                {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.shipping-configuration.create"}
+                                <a class="btn btn-default btn-primary pull-right" title="{intl l='Add a new shipping configuration'}" href="#creation_dialog" data-toggle="modal">
+                                    <span class="glyphicon glyphicon-plus-sign"></span>
+                                </a>
+                                {/loop}                        
+                            </caption>
+                            <thead>
+    	                        <tr>	                           
+                                   <th>{intl l="Description"}</th>
 
-                               {module_include location='shipping_configuration_table_header'}
+                                   {module_include location='shipping_configuration_table_header'}
 
-                               <th>{intl l="Actions"}</th>
-	                        </tr>
-                        </thead>
+                                   <th>{intl l="Actions"}</th>
+    	                        </tr>
+                            </thead>
 
-                        <tbody>
-                            <tr>
-                               <td>France</td>                                   
+                            <tbody>
+                                <tr>
+                                   <td>France</td>                                   
 
-                                {module_include location='shipping_configuration_table_row'}
+                                    {module_include location='shipping_configuration_table_row'}
 
-                                <td>
-                                    {if ! $SECURED}
-                                        <div class="btn-group">
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-configuration.change"}
-                                               <a class="btn btn-default btn-xs shipping-configuration-change" title="{intl l='Change this shipping configuration'}" href="{url path="/admin/configuration/shipping_configuration/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
-                                            {/loop}
-                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.shipping-configuration.delete"}
-                                                <a class="btn btn-default btn-xs shipping-configuration-delete" title="{intl l='Delete this shipping configuration'}"  href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
-                                            {/loop}                                              
-                                        </div>
-                                    {else}
-                                        <i title="{intl l='This shipping configuration could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
-                                    {/if}
-                                </td>
-                            </tr>
-                            <tr>
-                               <td>Outre-Mer DOM</td>                                   
+                                    <td>
+                                        {if ! $SECURED}
+                                            <div class="btn-group">
+                                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-configuration.change"}
+                                                   <a class="btn btn-default btn-xs shipping-configuration-change" title="{intl l='Change this shipping configuration'}" href="{url path="/admin/configuration/shipping_configuration/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                                {/loop}
+                                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.shipping-configuration.delete"}
+                                                    <a class="btn btn-default btn-xs shipping-configuration-delete" title="{intl l='Delete this shipping configuration'}"  href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                                {/loop}                                              
+                                            </div>
+                                        {else}
+                                            <i title="{intl l='This shipping configuration could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
+                                        {/if}
+                                    </td>
+                                </tr>
+                                <tr>
+                                   <td>Outre-Mer DOM</td>                                   
 
-                                {module_include location='shipping_configuration_table_row'}
+                                    {module_include location='shipping_configuration_table_row'}
 
-                                <td>
-                                    {if ! $SECURED}
-                                        <div class="btn-group">
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-configuration.change"}
-                                               <a class="btn btn-default btn-xs shipping-configuration-change" title="{intl l='Change this shipping configuration'}" href="{url path="/admin/configuration/shipping_configuration/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
-                                            {/loop}
-                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.shipping-configuration.delete"}
-                                                <a class="btn btn-default btn-xs shipping-configuration-delete" title="{intl l='Delete this shipping configuration'}"  href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
-                                            {/loop}                                              
-                                        </div>
-                                    {else}
-                                        <i title="{intl l='This shipping configuration could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
-                                    {/if}
-                                </td>
-                            </tr>
-                            <tr>
-                               <td>Outre-Mer TOM</td>                                   
+                                    <td>
+                                        {if ! $SECURED}
+                                            <div class="btn-group">
+                                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-configuration.change"}
+                                                   <a class="btn btn-default btn-xs shipping-configuration-change" title="{intl l='Change this shipping configuration'}" href="{url path="/admin/configuration/shipping_configuration/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                                {/loop}
+                                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.shipping-configuration.delete"}
+                                                    <a class="btn btn-default btn-xs shipping-configuration-delete" title="{intl l='Delete this shipping configuration'}"  href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                                {/loop}                                              
+                                            </div>
+                                        {else}
+                                            <i title="{intl l='This shipping configuration could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
+                                        {/if}
+                                    </td>
+                                </tr>
+                                <tr>
+                                   <td>Outre-Mer TOM</td>                                   
 
-                                {module_include location='shipping_configuration_table_row'}
+                                    {module_include location='shipping_configuration_table_row'}
 
-                                <td>
-                                    {if ! $SECURED}
-                                        <div class="btn-group">
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-configuration.change"}
-                                               <a class="btn btn-default btn-xs shipping-configuration-change" title="{intl l='Change this shipping configuration'}" href="{url path="/admin/configuration/shipping_configuration/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
-                                            {/loop}
-                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.shipping-configuration.delete"}
-                                                <a class="btn btn-default btn-xs shipping-configuration-delete" title="{intl l='Delete this shipping configuration'}"  href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
-                                            {/loop}                                              
-                                        </div>
-                                    {else}
-                                        <i title="{intl l='This shipping configuration could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
-                                    {/if}
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
+                                    <td>
+                                        {if ! $SECURED}
+                                            <div class="btn-group">
+                                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-configuration.change"}
+                                                   <a class="btn btn-default btn-xs shipping-configuration-change" title="{intl l='Change this shipping configuration'}" href="{url path="/admin/configuration/shipping_configuration/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                                {/loop}
+                                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.shipping-configuration.delete"}
+                                                    <a class="btn btn-default btn-xs shipping-configuration-delete" title="{intl l='Delete this shipping configuration'}"  href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                                {/loop}                                              
+                                            </div>
+                                        {else}
+                                            <i title="{intl l='This shipping configuration could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
+                                        {/if}
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/templates/admin/default/shipping-zones-edit.html b/templates/admin/default/shipping-zones-edit.html
index 70ee29a35..c330f9064 100644
--- a/templates/admin/default/shipping-zones-edit.html
+++ b/templates/admin/default/shipping-zones-edit.html
@@ -48,40 +48,42 @@
                         </div>
 
                         <div class="col-md-8">
-                            <table class="table table-striped table-condensed">
-                                <thead>
-                                    <tr>
-                                        <th>{intl l="Zones"}</th>
-                                        <th>{intl l="Actions"}</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr>
-                                        <td>France</td>
-                                        <td>
-                                            <a class="btn btn-default btn-xs" title="{intl l='Delete this zone'}"  href="#delete_zone_dialog" data-id="{$ID}" data-toggle="modal">
-                                                <span class="glyphicon glyphicon-trash"></span>
-                                            </a>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>Zone 1</td>
-                                        <td>
-                                            <a class="btn btn-default btn-xs" title="{intl l='Delete this zone'}"  href="#delete_zone_dialog" data-id="{$ID}" data-toggle="modal">
-                                                <span class="glyphicon glyphicon-trash"></span>
-                                            </a>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>Zone 2</td>
-                                        <td>
-                                            <a class="btn btn-default btn-xs" title="{intl l='Delete this zone'}"  href="#delete_zone_dialog" data-id="{$ID}" data-toggle="modal">
-                                                <span class="glyphicon glyphicon-trash"></span>
-                                            </a>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
+                            <div class="table-responsive">
+                                <table class="table table-striped table-condensed">
+                                    <thead>
+                                        <tr>
+                                            <th>{intl l="Zones"}</th>
+                                            <th>{intl l="Actions"}</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <tr>
+                                            <td>France</td>
+                                            <td>
+                                                <a class="btn btn-default btn-xs" title="{intl l='Delete this zone'}"  href="#delete_zone_dialog" data-id="{$ID}" data-toggle="modal">
+                                                    <span class="glyphicon glyphicon-trash"></span>
+                                                </a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>Zone 1</td>
+                                            <td>
+                                                <a class="btn btn-default btn-xs" title="{intl l='Delete this zone'}"  href="#delete_zone_dialog" data-id="{$ID}" data-toggle="modal">
+                                                    <span class="glyphicon glyphicon-trash"></span>
+                                                </a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>Zone 2</td>
+                                            <td>
+                                                <a class="btn btn-default btn-xs" title="{intl l='Delete this zone'}"  href="#delete_zone_dialog" data-id="{$ID}" data-toggle="modal">
+                                                    <span class="glyphicon glyphicon-trash"></span>
+                                                </a>
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
                         </div>
                     </div>
                     
diff --git a/templates/admin/default/shipping-zones.html b/templates/admin/default/shipping-zones.html
index e7c624b52..20ffef799 100644
--- a/templates/admin/default/shipping-zones.html
+++ b/templates/admin/default/shipping-zones.html
@@ -20,74 +20,76 @@
         <div class="row">
             <div class="col-md-12">
                 <div class="general-block-decorator">
-                    <table class="table table-striped table-condensed table-left-aligned">
-                        <caption>
-                           {intl l='Thelia Shipping zones'}                           
-                        </caption>
-                        <thead>
-	                        <tr>	                           
-                               <th>{intl l="Name"}</th>
+                    <div class="table-responsive">
+                        <table class="table table-striped table-condensed table-left-aligned">
+                            <caption>
+                               {intl l='Thelia Shipping zones'}                           
+                            </caption>
+                            <thead>
+    	                        <tr>	                           
+                                   <th>{intl l="Name"}</th>
 
-                               {module_include location='shipping_zones_table_header'}
+                                   {module_include location='shipping_zones_table_header'}
 
-                               <th>{intl l="Actions"}</th>
-	                        </tr>
-                        </thead>
+                                   <th>{intl l="Actions"}</th>
+    	                        </tr>
+                            </thead>
 
-                        <tbody>
-                            <tr>
-                               <td>So Colissimo</td>                                   
+                            <tbody>
+                                <tr>
+                                   <td>So Colissimo</td>                                   
 
-                                {module_include location='shipping_zones_table_row'}
+                                    {module_include location='shipping_zones_table_row'}
 
-                                <td>
-                                    {if ! $SECURED}
-                                        <div class="btn-group">
-                                           {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-zones.change"}
-                                               <a class="btn btn-default btn-xs shipping-zones-change" title="{intl l='Change this shipping zone'}" href="{url path="/admin/configuration/shipping_zones/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
-                                           {/loop}                                               
-                                        </div>
-                                    {else}
-                                        <i title="{intl l='This shipping zone could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
-                                    {/if}
-                                </td>
-                            </tr>                           
-                            <tr>
-                               <td>Chronopost</td>                                   
+                                    <td>
+                                        {if ! $SECURED}
+                                            <div class="btn-group">
+                                               {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-zones.change"}
+                                                   <a class="btn btn-default btn-xs shipping-zones-change" title="{intl l='Change this shipping zone'}" href="{url path="/admin/configuration/shipping_zones/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                               {/loop}                                               
+                                            </div>
+                                        {else}
+                                            <i title="{intl l='This shipping zone could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
+                                        {/if}
+                                    </td>
+                                </tr>                           
+                                <tr>
+                                   <td>Chronopost</td>                                   
 
-                                {module_include location='shipping_zones_table_row'}
+                                    {module_include location='shipping_zones_table_row'}
 
-                                <td>
-                                    {if ! $SECURED}
-                                        <div class="btn-group">
-                                           {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-zones.change"}
-                                               <a class="btn btn-default btn-xs shipping-zones-change" title="{intl l='Change this shipping zone'}" href="{url path="/admin/configuration/shipping_zones/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
-                                           {/loop}                                               
-                                        </div>
-                                    {else}
-                                        <i title="{intl l='This shipping zone could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
-                                    {/if}
-                                </td>
-                            </tr>                           
-                            <tr>
-                               <td>Kiala</td>                                   
+                                    <td>
+                                        {if ! $SECURED}
+                                            <div class="btn-group">
+                                               {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-zones.change"}
+                                                   <a class="btn btn-default btn-xs shipping-zones-change" title="{intl l='Change this shipping zone'}" href="{url path="/admin/configuration/shipping_zones/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                               {/loop}                                               
+                                            </div>
+                                        {else}
+                                            <i title="{intl l='This shipping zone could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
+                                        {/if}
+                                    </td>
+                                </tr>                           
+                                <tr>
+                                   <td>Kiala</td>                                   
 
-                                {module_include location='shipping_zones_table_row'}
+                                    {module_include location='shipping_zones_table_row'}
 
-                                <td>
-                                    {if ! $SECURED}
-	                                    <div class="btn-group">
-                                           {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-zones.change"}
-                                               <a class="btn btn-default btn-xs shipping-zones-change" title="{intl l='Change this shipping zone'}" href="{url path="/admin/configuration/shipping_zones/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
-                                           {/loop}                                               
-	                                    </div>
-	                                {else}
-	                                    <i title="{intl l='This shipping zone could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
-                                    {/if}
-                                </td>
-                            </tr>	                        
-                        </tbody>
-                    </table>
+                                    <td>
+                                        {if ! $SECURED}
+    	                                    <div class="btn-group">
+                                               {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-zones.change"}
+                                                   <a class="btn btn-default btn-xs shipping-zones-change" title="{intl l='Change this shipping zone'}" href="{url path="/admin/configuration/shipping_zones/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                               {/loop}                                               
+    	                                    </div>
+    	                                {else}
+    	                                    <i title="{intl l='This shipping zone could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
+                                        {/if}
+                                    </td>
+                                </tr>	                        
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/templates/admin/default/templates.html b/templates/admin/default/templates.html
index 6f88bed47..f7e912e9c 100644
--- a/templates/admin/default/templates.html
+++ b/templates/admin/default/templates.html
@@ -25,86 +25,88 @@
 	                    {if ! empty($general_error) }
 	                        <div class="alert alert-danger">{$general_error}</div>
 	                    {/if}
+                        
+                        <div class="table-responsive">
+    	                    <table class="table table-striped table-condensed table-left-aligned">
+    	                        <caption>
+    	                           {intl l='Thelia product templates'}
 
-	                    <table class="table table-striped table-condensed table-left-aligned">
-	                        <caption>
-	                           {intl l='Thelia product templates'}
+                                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.templates.create"}
+                                    <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new product template'}" href="#creation_dialog" data-toggle="modal">
+                                        <span class="glyphicon glyphicon-plus-sign"></span>
+                                    </a>
+                                    {/loop}
+    	                        </caption>
+                                <thead>
+                                    <tr>
+                                        <th>
+                                            {admin_sortable_header
+    	                                        current_order=$order
+    	                                        order='id'
+    	                                        reverse_order='id_reverse'
+    	                                        path='/admin/configuration/templates'
+    	                                        label="{intl l='ID'}"
+                                            }
+                                        </th>
 
-                                {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.templates.create"}
-                                <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new product template'}" href="#creation_dialog" data-toggle="modal">
-                                    <span class="glyphicon glyphicon-plus-sign"></span>
-                                </a>
-                                {/loop}
-	                        </caption>
-                            <thead>
-                                <tr>
-                                    <th>
-                                        {admin_sortable_header
-	                                        current_order=$order
-	                                        order='id'
-	                                        reverse_order='id_reverse'
-	                                        path='/admin/configuration/templates'
-	                                        label="{intl l='ID'}"
-                                        }
-                                    </th>
+                                        <th>
+                                            {admin_sortable_header
+    	                                        current_order=$order
+    	                                        order='alpha'
+    	                                        reverse_order='alpha_reverse'
+    	                                        path='/admin/configuration/templates'
+    	                                        label="{intl l='Title'}"
+                                            }
+                                        </th>
 
-                                    <th>
-                                        {admin_sortable_header
-	                                        current_order=$order
-	                                        order='alpha'
-	                                        reverse_order='alpha_reverse'
-	                                        path='/admin/configuration/templates'
-	                                        label="{intl l='Title'}"
-                                        }
-                                    </th>
+                                        {module_include location='templates_table_header'}
 
-                                    {module_include location='templates_table_header'}
+                                        <th class="actions">{intl l="Actions"}</th>
+                                    </tr>
+                                </thead>
 
-                                    <th class="actions">{intl l="Actions"}</th>
-                                </tr>
-                            </thead>
+                                <tbody>
+                                    {loop name="list" type="template" backend_context="1" lang=$lang_id order=$order}
+                                    <tr>
+                                        <td>{$ID}</td>
 
-                            <tbody>
-                                {loop name="list" type="template" backend_context="1" lang=$lang_id order=$order}
-                                <tr>
-                                    <td>{$ID}</td>
+                                        <td>
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.templates.change"}
+                                                <a title="{intl l='Change this template'}" href="{url path='/admin/configuration/templates/update' template_id=$ID}">{$NAME}</a>
+                                            {/loop}
+                                            {elseloop rel="can_change"}
+                                                {$NAME}
+                                            {/elseloop}
+                                        </td>
 
-                                    <td>
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.templates.change"}
-                                            <a title="{intl l='Change this template'}" href="{url path='/admin/configuration/templates/update' template_id=$ID}">{$NAME}</a>
-                                        {/loop}
-                                        {elseloop rel="can_change"}
-                                            {$NAME}
-                                        {/elseloop}
-                                    </td>
+                                        {module_include location='templates_table_row'}
 
-                                    {module_include location='templates_table_row'}
+                                        <td class="actions">
+                                            <div class="btn-group">
+    	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.templates.change"}
+    	                                            <a class="btn btn-default btn-xs template-change" title="{intl l='Change this product template'}" href="{url path='/admin/configuration/templates/update' template_id=$ID}"><span class="glyphicon glyphicon-edit"></span></a>
+    	                                        {/loop}
 
-                                    <td class="actions">
-                                        <div class="btn-group">
-	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.templates.change"}
-	                                            <a class="btn btn-default btn-xs template-change" title="{intl l='Change this product template'}" href="{url path='/admin/configuration/templates/update' template_id=$ID}"><span class="glyphicon glyphicon-edit"></span></a>
-	                                        {/loop}
+    	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.templates.delete"}
+    	                                            <a class="btn btn-default btn-xs template-delete" title="{intl l='Delete this product template'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+    	                                        {/loop}
+                                            </div>
+                                        </td>
+                                    </tr>
+                                     {/loop}
 
-	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.templates.delete"}
-	                                            <a class="btn btn-default btn-xs template-delete" title="{intl l='Delete this product template'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-	                                        {/loop}
-                                        </div>
-                                    </td>
-                                </tr>
-                                 {/loop}
-
-                                 {elseloop rel="list"}
-                                     <tr>
-                                         <td colspan="4">
-                                             <div class="alert alert-info">
-                                                 {intl l="No product template has been created yet. Click the + button to create one."}
-                                             </div>
-                                         </td>
-                                     </tr>
-                                 {/elseloop}
-                            </tbody>
-	                    </table>
+                                     {elseloop rel="list"}
+                                         <tr>
+                                             <td colspan="4">
+                                                 <div class="alert alert-info">
+                                                     {intl l="No product template has been created yet. Click the + button to create one."}
+                                                 </div>
+                                             </td>
+                                         </tr>
+                                     {/elseloop}
+                                </tbody>
+    	                    </table>
+                        </div>
 	                </div>
                 </form>
             </div>
diff --git a/templates/admin/default/variables.html b/templates/admin/default/variables.html
index 6100466bd..0ce47727d 100644
--- a/templates/admin/default/variables.html
+++ b/templates/admin/default/variables.html
@@ -21,6 +21,7 @@
             <div class="col-md-12">
                 <form action="{url path='/admin/configuration/variables/update-values'}" method="post">
 	                <div class="general-block-decorator">
+                    <div class="table-responsive">
 	                    <table class="table table-striped table-condensed table-left-aligned">
 	                        <caption class="clearfix">
 	                           {intl l='Thelia system variables'}
@@ -122,6 +123,7 @@
   	                        {/loop}
                           </tbody>
 	                    </table>
+                    </div>
 	                </div>
                 </form>
             </div>

From 05aa284f4ba0394685ffbe6c855698f929aeb7b2 Mon Sep 17 00:00:00 2001
From: franck <franck@cqfdev.fr>
Date: Thu, 19 Sep 2013 17:06:10 +0200
Subject: [PATCH 24/51] Fixed minor UI glithces

---
 templates/admin/default/categories.html    |  8 +-
 templates/admin/default/category-edit.html | 99 +++++++++++++---------
 2 files changed, 61 insertions(+), 46 deletions(-)

diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html
index 3c2e6f00a..68fd220b5 100755
--- a/templates/admin/default/categories.html
+++ b/templates/admin/default/categories.html
@@ -266,14 +266,14 @@
 
                              <td>
                              {loop type="image" name="cat_image" source="product" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
-                               <a href="{url path='admin/product/edit' id=$ID}" title="{intl l='Edit this product'}">
+                               <a href="{url path='/admin/products/update' product_id=$ID}" title="{intl l='Edit this product'}">
                                  <img src="{$IMAGE_URL}" alt="{$TITLE}" />
                                </a>
                              {/loop}
 
-                             <td class="object-title"><a href="{url path="/admin/product/update/$ID"}" title="{intl l='Edit this product'}">{$REF}</a></td>
+                             <td class="object-title"><a href="{url path='/admin/products/update' product_id=$ID}" title="{intl l='Edit this product'}">{$REF}</a></td>
 
-                             <td class="object-title"><a href="{url path="/admin/product/update/$ID"}" title="{intl l='Edit this product'}">{$TITLE}</a></td>
+                             <td class="object-title"><a href="{url path='/admin/products/update' product_id=$ID}" title="{intl l='Edit this product'}">{$TITLE}</a></td>
 
                              {module_include location='product_list_row'}
 
@@ -305,7 +305,7 @@
                              <td>
                                  <div class="btn-group">
                                  {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.product.edit"}
-                                    <a class="btn btn-default btn-xs" title="{intl l='Edit this product'}" href="{url path="admin/product/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                    <a class="btn btn-default btn-xs" title="{intl l='Edit this product'}" href="{url path='/admin/products/update' product_id=$ID}"><i class="glyphicon glyphicon-edit"></i></a>
                                 {/loop}
 
                                  {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.product.delete"}
diff --git a/templates/admin/default/category-edit.html b/templates/admin/default/category-edit.html
index ddf39f5f2..a4a69ff3d 100755
--- a/templates/admin/default/category-edit.html
+++ b/templates/admin/default/category-edit.html
@@ -40,24 +40,23 @@
 	                <div class="col-md-12">
 
 						<ul class="nav nav-tabs" id="tabbed-menu">
-		                    <li class="active"><a href="#general" data-toggle="tab">{intl l="General description"}</a></li>
-
-		                    <li><a href="#details" data-toggle="tab">{intl l="Details"}</a></li>
-		                    <li><a href="#images" data-toggle="tab">{intl l="Images"}</a></li>
-		                    <li><a href="#documents" data-toggle="tab">{intl l="Documents"}</a></li>
-		                    <li><a href="#modules" data-toggle="tab">{intl l="Modules"}</a></li>
+                            <li {if $current_tab == 'general'}class="active"{/if}><a href="#general" data-toggle="tab">{intl l="General description"}</a></li>
+                            <li {if $current_tab == 'details'}class="active"{/if}><a href="#details" data-toggle="tab">{intl l="Details"}</a></li>
+                            <li {if $current_tab == 'images'}class="active"{/if}><a href="#images" data-toggle="tab">{intl l="Images"}</a></li>
+                            <li {if $current_tab == 'documents'}class="active"{/if}><a href="#documents" data-toggle="tab">{intl l="Documents"}</a></li>
+                            <li {if $current_tab == 'modules'}class="active"{/if}><a href="#modules" data-toggle="tab">{intl l="Modules"}</a></li>
 		 				</ul>
 
 		                <div class="tab-content">
 
-		                    <div class="tab-pane fade active in" id="general">
+		                    <div class="tab-pane fade {if $current_tab == 'general'}active in{/if}" id="general">
 
 			                    <div class="form-container">
 
 				                    {form name="thelia.admin.category.modification"}
 				                    <form method="POST" action="{url path='/admin/categories/save'}" {form_enctype form=$form} class="clearfix">
 
-	                                    {include file="includes/inner-form-toolbar.html" close_url="{url path='/admin/categories' category_id=$category_id}"}
+	                                    {include file="includes/inner-form-toolbar.html" close_url="{url path='/admin/categories' category_id=$PARENT}"}
 
 			                            {* Be sure to get the category ID, even if the form could not be validated *}
 			                            <input type="hidden" name="category_id" value="{$category_id}" />
@@ -141,7 +140,7 @@
 			                    </div>
 		                    </div>
 
-		                    <div class="tab-pane fade" id="details">
+		                    <div class="tab-pane fade {if $current_tab == 'details'}active in{/if}" id="details">
 		                        <div class="form-container">
 									<div class="form-group">
 									    <form action="{url path='/admin/categories/related-content/add'}" id="related_content_form">
@@ -149,9 +148,12 @@
 									        {include
 									            file="includes/inner-form-toolbar.html"
 									            hide_submit_buttons=true
-									            close_url="{url path='/admin/categories' category_id=$category_id}"
+									            close_url="{url path='/admin/categories' category_id=$PARENT}"
 									        }
 
+                                            <p class="title title-without-tabs">{intl l='Related content'}</p>
+                                            <p>{intl l='You can attach here some content to this product'}</p>
+
 									        <input type="hidden" name="category_id" value="{$category_id}" />
 									        <input type="hidden" name="current_tab" value="details" />
 
@@ -162,8 +164,8 @@
 									                <div class="form-group">
 									                    <select name="folder_id" id="folder_id" class="form-control">
 									                        <option value="">Select a folder...</option>
-									                        {loop name="folders" type="folder" backend_context="1" lang="$edit_language_id"}
-									                            <option value="{$ID}">{$TITLE}</option>
+									                        {loop name="folders" type="folder-tree" folder="0" backend_context="1" lang="$edit_language_id"}
+									                            <option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px">{$TITLE}</option>
 									                        {/loop}
 									                    </select>
 									                </div>
@@ -183,6 +185,12 @@
 
 									                    <span class="help-block">{intl l='Select a content and click (+) to add it to this category'}</span>
 									                </div>
+
+									                <div id="content_selector_empty" class="hide">
+									                   <div class="alert alert-info">
+									                       {intl l="No available content in this folder"}
+									                   </div>
+									                </div>
 									            </div>
 
 									        </div>
@@ -200,7 +208,7 @@
 									        <tr>
 									            <th>{intl l='ID'}</th>
 
-									            <th>{intl l='Attribute title'}</th>
+									            <th>{intl l='Content title'}</th>
 
 									            {module_include location='category_contents_table_header'}
 
@@ -245,13 +253,13 @@
 			                    </div>
 		                    </div>
 
-		                    <div class="tab-pane fade" id="images">
+		                    <div class="tab-pane fade {if $current_tab == 'images'}active in{/if}" id="images">
 		                    </div>
 
-		                    <div class="tab-pane fade" id="documents">
+		                    <div class="tab-pane fade {if $current_tab == 'documents'}active in{/if}" id="documents">
 		                    </div>
 
-		                    <div class="tab-pane fade" id="modules">
+		                    <div class="tab-pane fade {if $current_tab == 'modules'}active in{/if}" id="modules">
 		                    </div>
 		                 </div>
                     </div>
@@ -287,7 +295,7 @@
 
 {block name="javascript-initialization"}
 
-<script src="/web/tinymce/tinymce.min.js"></script>
+<script src="{url file='/tinymce/tinymce.min.js'}"></script>
 <script>
 	tinymce.init({
 		selector: ".wysiwyg",
@@ -301,9 +309,9 @@
 		],
 		toolbar1: "undo redo | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | styleselect | filemanager | link unlink anchor | image media | forecolor backcolor  | print preview code ",
 		image_advtab: true ,
-		external_filemanager_path:"/web/tinymce/plugins/filemanager/",
+		external_filemanager_path:"{url file='/tinymce/plugins/filemanager/'}'",
 		filemanager_title:"{intl l='Files manager'}" ,
-		external_plugins: { "filemanager" : "/web/tinymce/plugins/filemanager/plugin.min.js"}
+		external_plugins: { "filemanager" : "{url file='/tinymce/plugins/filemanager/plugin.min.js'}"}
 	 });
 </script>
 
@@ -317,12 +325,6 @@ $(function() {
     	ev.preventDefault();
     });
 
-    // Show proper tab, if defined
-    {if ! empty($current_tab)}
-    $('#tabbed-menu a[href="#{$current_tab}"]').tab('show')
-    {/if}
-
-
     // Set proper content ID in delete content from
     $('a.delete-content').click(function(ev) {
         $('#content_delete_id').val($(this).data('id'));
@@ -331,28 +333,41 @@ $(function() {
 
     // Load content on folder selection
     $('#folder_id').change(function(event) {
-        $.ajax({
-             url      : '{url path="/admin/category/$category_id/available-related-content/"}' + $(this).val() + '.xml',
-             type     : 'get',
-             dataType : 'json',
-             success  : function(json) {
-                 $('#content_id :not(:first-child)').remove();
 
-                 var have_content = false;
+    	var val = $(this).val();
 
-                 $.each(json, function(idx, value) {
-                     $('#content_id').append($('<option>').text(value.title).attr('value', value.id));
+        if (val != "") {
+	        $.ajax({
+	             url      : '{url path="/admin/category/$category_id/available-related-content/"}' + val + '.xml',
+	             type     : 'get',
+	             dataType : 'json',
+	             success  : function(json) {
+	                 $('#content_id :not(:first-child)').remove();
 
-                     have_content = true; // Lame...
-                 });
+	                 var have_content = false;
 
-                 if (have_content)
-                     $('#content_selector').removeClass('hide');
-                 else
-                     $('#content_selector').addClass('hide');
+	                 $.each(json, function(idx, value) {
+	                     $('#content_id').append($('<option>').text(value.title).attr('value', value.id));
 
-             }
-        });
+	                     have_content = true; // Lame...
+	                 });
+
+	                 if (have_content) {
+	                	 $('#content_selector_empty').addClass('hide');
+	                     $('#content_selector').removeClass('hide');
+	                 }
+	                 else {
+	                	 $('#content_selector_empty').removeClass('hide');
+	                     $('#content_selector').addClass('hide');
+	                 }
+
+	             }
+	        });
+        }
+        else {
+            $('#content_selector_empty').addClass('hide');
+        	$('#content_selector').addClass('hide');
+        }
     });
 
     // Initialize folder (id={$folder_id}) select value

From 169b3c2659b827d726299d5d5e01c57b3d486e48 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Thu, 19 Sep 2013 17:30:57 +0200
Subject: [PATCH 25/51] Setting profile edition route and view

---
 core/lib/Thelia/Config/Resources/routing/admin.xml   | 6 ++++++
 core/lib/Thelia/Controller/Admin/AdminController.php | 5 +++++
 templates/admin/default/admin-layout.tpl             | 2 +-
 templates/admin/default/profile-edit.html            | 0
 4 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 templates/admin/default/profile-edit.html

diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index e09d24a90..693224fa7 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -24,6 +24,12 @@
         <default key="_controller">Thelia\Controller\Admin\SessionController::checkLoginAction</default>
     </route>
 
+    <!-- Route to edit admin profile -->
+    <route id="admin.profile.update.view" path="/admin/profile/update" methods="get">
+        <default key="_controller">Thelia\Controller\Admin\AdminController::updateAction</default>
+    </route>
+
+
 
 	<!-- Route to the catalog controller -->
 
diff --git a/core/lib/Thelia/Controller/Admin/AdminController.php b/core/lib/Thelia/Controller/Admin/AdminController.php
index 2c252258d..2d3d80df1 100755
--- a/core/lib/Thelia/Controller/Admin/AdminController.php
+++ b/core/lib/Thelia/Controller/Admin/AdminController.php
@@ -33,4 +33,9 @@ class AdminController extends BaseAdminController
     {
         return $this->render("home");
     }
+
+    public function updateAction()
+    {
+    	return $this->render("profile-edit");
+    }
 }
diff --git a/templates/admin/default/admin-layout.tpl b/templates/admin/default/admin-layout.tpl
index b80d5d13c..553466def 100644
--- a/templates/admin/default/admin-layout.tpl
+++ b/templates/admin/default/admin-layout.tpl
@@ -62,7 +62,7 @@
                                     <span class="caret"></span>
                                 </button>
                                 <ul class="dropdown-menu">
-                                    <li><a class="profile" href="{url path='admin/edit_profile'}"><span class="glyphicon glyphicon-edit"></span> {intl l="Profil"}</a></li>
+                                    <li><a class="profile" href="{url path='admin/profile/update'}"><span class="glyphicon glyphicon-edit"></span> {intl l="Profil"}</a></li>
                                     <li><a class="logout" href="{url path='admin/logout'}" title="{intl l='Close administation session'}"><span class="glyphicon glyphicon-off"></span> {intl l="Logout"}</a></li>
                                 </ul>
                             </div>
diff --git a/templates/admin/default/profile-edit.html b/templates/admin/default/profile-edit.html
new file mode 100644
index 000000000..e69de29bb

From 1f5cd1da6231d2b29272ad41c58daeac18a2beb9 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Thu, 19 Sep 2013 17:48:01 +0200
Subject: [PATCH 26/51] create category template

---
 templates/default/category.html | 19 +++++++++++++++++++
 templates/default/product.html  | 11 +++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 templates/default/category.html

diff --git a/templates/default/category.html b/templates/default/category.html
new file mode 100644
index 000000000..8bca4fbde
--- /dev/null
+++ b/templates/default/category.html
@@ -0,0 +1,19 @@
+{extends file='layout.tpl'}
+
+{block name="breadcrumb"}
+    <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
+        <strong id="breadcrumb-label">You are here: </strong>
+        <ul class="breadcrumb" itemprop="breadcrumb">
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
+            {loop name="category_path" type="category-path" category="{category attr="id"}"}
+            {if $ID == {category attr="id"}}
+                <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active">
+                    <span itemprop="title">{$TITLE}</span>
+                </li>
+            {else}
+                <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{$URL}"  itemprop="url"><span itemprop="title">{$TITLE}</span></a></li>
+            {/if}
+            {/loop}
+        </ul>
+    </nav><!-- /.nav-breadcrumb -->
+{/block}
diff --git a/templates/default/product.html b/templates/default/product.html
index fbce6d510..c2135d232 100644
--- a/templates/default/product.html
+++ b/templates/default/product.html
@@ -4,10 +4,13 @@
     <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
         <strong id="breadcrumb-label">{intl l="You are here"}: </strong>
         <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="index.php" itemprop="url"><span itemprop="title">Home</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="category.php" itemprop="url"><span itemprop="title">Category 1</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="category.php" itemprop="url"><span itemprop="title">Category 1.2</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">Product name</span></li>
+            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
+            {loop type="product" name="product_breadcrumb" id="{product attr="id"}"}
+                {loop name="category_path" type="category-path" category="{$DEFAULT_CATEGORY}"}
+                <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{$URL}" itemprop="url"><span itemprop="title">{$TITLE}</span></a></li>
+                {/loop}
+                <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{$TITLE}</span></li>
+            {/loop}
         </ul>
     </nav><!-- /.nav-breadcrumb -->
 {/block}

From 1d969e38ec25e952d85ee244b49dc3f2309cf8f1 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Thu, 19 Sep 2013 18:30:13 +0200
Subject: [PATCH 27/51] order tables

---
 core/lib/Thelia/Action/Order.php              |   31 +-
 ...duct.php => OrderAttributeCombination.php} |  948 ++++++---------
 .../Base/OrderAttributeCombinationQuery.php   |  897 +++++++++++++++
 .../Thelia/Model/Base/OrderProductQuery.php   | 1022 -----------------
 ... => OrderAttributeCombinationTableMap.php} |  224 ++--
 .../Model/OrderAttributeCombination.php       |   10 +
 ...php => OrderAttributeCombinationQuery.php} |    9 +-
 core/lib/Thelia/Model/OrderProduct.php        |    9 -
 install/thelia.sql                            |   28 +-
 local/config/schema.xml                       |   24 +-
 10 files changed, 1406 insertions(+), 1796 deletions(-)
 rename core/lib/Thelia/Model/Base/{OrderProduct.php => OrderAttributeCombination.php} (58%)
 create mode 100644 core/lib/Thelia/Model/Base/OrderAttributeCombinationQuery.php
 delete mode 100644 core/lib/Thelia/Model/Base/OrderProductQuery.php
 rename core/lib/Thelia/Model/Map/{OrderProductTableMap.php => OrderAttributeCombinationTableMap.php} (51%)
 create mode 100644 core/lib/Thelia/Model/OrderAttributeCombination.php
 rename core/lib/Thelia/Model/{OrderProductQuery.php => OrderAttributeCombinationQuery.php} (55%)
 mode change 100755 => 100644
 delete mode 100755 core/lib/Thelia/Model/OrderProduct.php

diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php
index 4a982673a..c5926acea 100755
--- a/core/lib/Thelia/Action/Order.php
+++ b/core/lib/Thelia/Action/Order.php
@@ -30,6 +30,7 @@ use Thelia\Core\Event\OrderEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Base\AddressQuery;
 use Thelia\Model\ModuleQuery;
+use Thelia\Model\OrderProduct;
 use Thelia\Model\OrderStatus;
 use Thelia\Model\Map\OrderTableMap;
 use Thelia\Model\OrderAddress;
@@ -108,14 +109,17 @@ class Order extends BaseAction implements EventSubscriberInterface
 
         /* use a copy to avoid errored reccord in session */
         $placedOrder = $sessionOrder->copy();
+        $placedOrder->setDispatcher($this->getDispatcher());
 
         $customer = $this->getSecurityContext()->getCustomerUser();
         $currency = $this->getSession()->getCurrency();
         $lang = $this->getSession()->getLang();
         $deliveryAddress = AddressQuery::create()->findPk($sessionOrder->chosenDeliveryAddress);
         $invoiceAddress = AddressQuery::create()->findPk($sessionOrder->chosenInvoiceAddress);
+        $cart = $this->getSession()->getCart();
+        $cartItems = $cart->getCartItems();
 
-        $paymentModule = ModuleQuery::findPk($placedOrder->getPaymentModuleId());
+        $paymentModule = ModuleQuery::create()->findPk($placedOrder->getPaymentModuleId());
 
         /* fulfill order */
         $placedOrder->setCustomerId($customer->getId());
@@ -163,7 +167,16 @@ class Order extends BaseAction implements EventSubscriberInterface
 
         $placedOrder->save($con);
 
-        /* fulfill order_products and decrease stock // @todo dispatch event */
+        /* fulfill order_products and decrease stock // @todo + dispatch event */
+
+        foreach($cartItems as $cartItem) {
+            $orderProduct = new OrderProduct();
+            $orderProduct
+                ->setOrderId($placedOrder->getId())
+            ;
+
+            $in = true;
+        }
 
         /* discount @todo */
 
@@ -171,14 +184,15 @@ class Order extends BaseAction implements EventSubscriberInterface
 
         /* T1style : dispatch mail event ? */
 
-        /* clear session ? */
+        /* clear session @todo : remove comment below + test */
+        //$sessionOrder = new \Thelia\Model\Order();
 
         /* call pay method */
         $paymentModuleReflection = new \ReflectionClass($paymentModule->getFullNamespace());
         $paymentModuleInstance = $paymentModuleReflection->newInstance();
 
-        $paymentModuleInstance->setRequest($this->request);
-        $paymentModuleInstance->setDispatcher($this->dispatcher);
+        $paymentModuleInstance->setRequest($this->getRequest());
+        $paymentModuleInstance->setDispatcher($this->getDispatcher());
 
         $paymentModuleInstance->pay();
     }
@@ -188,14 +202,13 @@ class Order extends BaseAction implements EventSubscriberInterface
      */
     public function setReference(OrderEvent $event)
     {
-        $x = true;
-
-        $this->setRef($this->generateRef());
+        $event->getOrder()->setRef($this->generateRef());
     }
 
     public function generateRef()
     {
-        return sprintf('O', uniqid('', true), $this->getId());
+        /* order addresses are unique */
+        return uniqid('ORD', true);
     }
 
     /**
diff --git a/core/lib/Thelia/Model/Base/OrderProduct.php b/core/lib/Thelia/Model/Base/OrderAttributeCombination.php
similarity index 58%
rename from core/lib/Thelia/Model/Base/OrderProduct.php
rename to core/lib/Thelia/Model/Base/OrderAttributeCombination.php
index 2bf9c7ace..09bd77c28 100644
--- a/core/lib/Thelia/Model/Base/OrderProduct.php
+++ b/core/lib/Thelia/Model/Base/OrderAttributeCombination.php
@@ -10,27 +10,24 @@ use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\ActiveQuery\ModelCriteria;
 use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
 use Propel\Runtime\Collection\Collection;
-use Propel\Runtime\Collection\ObjectCollection;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Propel\Runtime\Exception\BadMethodCallException;
 use Propel\Runtime\Exception\PropelException;
 use Propel\Runtime\Map\TableMap;
 use Propel\Runtime\Parser\AbstractParser;
 use Propel\Runtime\Util\PropelDateTime;
-use Thelia\Model\Order as ChildOrder;
-use Thelia\Model\OrderFeature as ChildOrderFeature;
-use Thelia\Model\OrderFeatureQuery as ChildOrderFeatureQuery;
+use Thelia\Model\OrderAttributeCombination as ChildOrderAttributeCombination;
+use Thelia\Model\OrderAttributeCombinationQuery as ChildOrderAttributeCombinationQuery;
 use Thelia\Model\OrderProduct as ChildOrderProduct;
 use Thelia\Model\OrderProductQuery as ChildOrderProductQuery;
-use Thelia\Model\OrderQuery as ChildOrderQuery;
-use Thelia\Model\Map\OrderProductTableMap;
+use Thelia\Model\Map\OrderAttributeCombinationTableMap;
 
-abstract class OrderProduct implements ActiveRecordInterface
+abstract class OrderAttributeCombination implements ActiveRecordInterface
 {
     /**
      * TableMap class name
      */
-    const TABLE_MAP = '\\Thelia\\Model\\Map\\OrderProductTableMap';
+    const TABLE_MAP = '\\Thelia\\Model\\Map\\OrderAttributeCombinationTableMap';
 
 
     /**
@@ -66,58 +63,58 @@ abstract class OrderProduct implements ActiveRecordInterface
     protected $id;
 
     /**
-     * The value for the order_id field.
+     * The value for the order_product_id field.
      * @var        int
      */
-    protected $order_id;
+    protected $order_product_id;
 
     /**
-     * The value for the product_ref field.
+     * The value for the attribute_title field.
      * @var        string
      */
-    protected $product_ref;
+    protected $attribute_title;
 
     /**
-     * The value for the title field.
+     * The value for the attribute_chapo field.
      * @var        string
      */
-    protected $title;
+    protected $attribute_chapo;
 
     /**
-     * The value for the description field.
+     * The value for the attribute_description field.
      * @var        string
      */
-    protected $description;
+    protected $attribute_description;
 
     /**
-     * The value for the chapo field.
+     * The value for the attribute_postscriptumn field.
      * @var        string
      */
-    protected $chapo;
+    protected $attribute_postscriptumn;
 
     /**
-     * The value for the quantity field.
-     * @var        double
+     * The value for the attribute_av_title field.
+     * @var        string
      */
-    protected $quantity;
+    protected $attribute_av_title;
 
     /**
-     * The value for the price field.
-     * @var        double
+     * The value for the attribute_av_chapo field.
+     * @var        string
      */
-    protected $price;
+    protected $attribute_av_chapo;
 
     /**
-     * The value for the tax field.
-     * @var        double
+     * The value for the attribute_av_description field.
+     * @var        string
      */
-    protected $tax;
+    protected $attribute_av_description;
 
     /**
-     * The value for the parent field.
-     * @var        int
+     * The value for the attribute_av_postscriptum field.
+     * @var        string
      */
-    protected $parent;
+    protected $attribute_av_postscriptum;
 
     /**
      * The value for the created_at field.
@@ -132,15 +129,9 @@ abstract class OrderProduct implements ActiveRecordInterface
     protected $updated_at;
 
     /**
-     * @var        Order
+     * @var        OrderProduct
      */
-    protected $aOrder;
-
-    /**
-     * @var        ObjectCollection|ChildOrderFeature[] Collection to store aggregation of ChildOrderFeature objects.
-     */
-    protected $collOrderFeatures;
-    protected $collOrderFeaturesPartial;
+    protected $aOrderProduct;
 
     /**
      * Flag to prevent endless save loop, if this object is referenced
@@ -151,13 +142,7 @@ abstract class OrderProduct implements ActiveRecordInterface
     protected $alreadyInSave = false;
 
     /**
-     * An array of objects scheduled for deletion.
-     * @var ObjectCollection
-     */
-    protected $orderFeaturesScheduledForDeletion = null;
-
-    /**
-     * Initializes internal state of Thelia\Model\Base\OrderProduct object.
+     * Initializes internal state of Thelia\Model\Base\OrderAttributeCombination object.
      */
     public function __construct()
     {
@@ -252,9 +237,9 @@ abstract class OrderProduct implements ActiveRecordInterface
     }
 
     /**
-     * Compares this with another <code>OrderProduct</code> instance.  If
-     * <code>obj</code> is an instance of <code>OrderProduct</code>, delegates to
-     * <code>equals(OrderProduct)</code>.  Otherwise, returns <code>false</code>.
+     * Compares this with another <code>OrderAttributeCombination</code> instance.  If
+     * <code>obj</code> is an instance of <code>OrderAttributeCombination</code>, delegates to
+     * <code>equals(OrderAttributeCombination)</code>.  Otherwise, returns <code>false</code>.
      *
      * @param      obj The object to compare to.
      * @return Whether equal to the object specified.
@@ -335,7 +320,7 @@ abstract class OrderProduct implements ActiveRecordInterface
      * @param string $name  The virtual column name
      * @param mixed  $value The value to give to the virtual column
      *
-     * @return OrderProduct The current object, for fluid interface
+     * @return OrderAttributeCombination The current object, for fluid interface
      */
     public function setVirtualColumn($name, $value)
     {
@@ -367,7 +352,7 @@ abstract class OrderProduct implements ActiveRecordInterface
      *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
      * @param string $data The source data to import from
      *
-     * @return OrderProduct The current object, for fluid interface
+     * @return OrderAttributeCombination The current object, for fluid interface
      */
     public function importFrom($parser, $data)
     {
@@ -422,102 +407,102 @@ abstract class OrderProduct implements ActiveRecordInterface
     }
 
     /**
-     * Get the [order_id] column value.
+     * Get the [order_product_id] column value.
      *
      * @return   int
      */
-    public function getOrderId()
+    public function getOrderProductId()
     {
 
-        return $this->order_id;
+        return $this->order_product_id;
     }
 
     /**
-     * Get the [product_ref] column value.
+     * Get the [attribute_title] column value.
      *
      * @return   string
      */
-    public function getProductRef()
+    public function getAttributeTitle()
     {
 
-        return $this->product_ref;
+        return $this->attribute_title;
     }
 
     /**
-     * Get the [title] column value.
+     * Get the [attribute_chapo] column value.
      *
      * @return   string
      */
-    public function getTitle()
+    public function getAttributeChapo()
     {
 
-        return $this->title;
+        return $this->attribute_chapo;
     }
 
     /**
-     * Get the [description] column value.
+     * Get the [attribute_description] column value.
      *
      * @return   string
      */
-    public function getDescription()
+    public function getAttributeDescription()
     {
 
-        return $this->description;
+        return $this->attribute_description;
     }
 
     /**
-     * Get the [chapo] column value.
+     * Get the [attribute_postscriptumn] column value.
      *
      * @return   string
      */
-    public function getChapo()
+    public function getAttributePostscriptumn()
     {
 
-        return $this->chapo;
+        return $this->attribute_postscriptumn;
     }
 
     /**
-     * Get the [quantity] column value.
+     * Get the [attribute_av_title] column value.
      *
-     * @return   double
+     * @return   string
      */
-    public function getQuantity()
+    public function getAttributeAvTitle()
     {
 
-        return $this->quantity;
+        return $this->attribute_av_title;
     }
 
     /**
-     * Get the [price] column value.
+     * Get the [attribute_av_chapo] column value.
      *
-     * @return   double
+     * @return   string
      */
-    public function getPrice()
+    public function getAttributeAvChapo()
     {
 
-        return $this->price;
+        return $this->attribute_av_chapo;
     }
 
     /**
-     * Get the [tax] column value.
+     * Get the [attribute_av_description] column value.
      *
-     * @return   double
+     * @return   string
      */
-    public function getTax()
+    public function getAttributeAvDescription()
     {
 
-        return $this->tax;
+        return $this->attribute_av_description;
     }
 
     /**
-     * Get the [parent] column value.
+     * Get the [attribute_av_postscriptum] column value.
      *
-     * @return   int
+     * @return   string
      */
-    public function getParent()
+    public function getAttributeAvPostscriptum()
     {
 
-        return $this->parent;
+        return $this->attribute_av_postscriptum;
     }
 
     /**
@@ -564,7 +549,7 @@ abstract class OrderProduct implements ActiveRecordInterface
      * Set the value of [id] column.
      *
      * @param      int $v new value
-     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
      */
     public function setId($v)
     {
@@ -574,7 +559,7 @@ abstract class OrderProduct implements ActiveRecordInterface
 
         if ($this->id !== $v) {
             $this->id = $v;
-            $this->modifiedColumns[] = OrderProductTableMap::ID;
+            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ID;
         }
 
 
@@ -582,204 +567,204 @@ abstract class OrderProduct implements ActiveRecordInterface
     } // setId()
 
     /**
-     * Set the value of [order_id] column.
+     * Set the value of [order_product_id] column.
      *
      * @param      int $v new value
-     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
      */
-    public function setOrderId($v)
+    public function setOrderProductId($v)
     {
         if ($v !== null) {
             $v = (int) $v;
         }
 
-        if ($this->order_id !== $v) {
-            $this->order_id = $v;
-            $this->modifiedColumns[] = OrderProductTableMap::ORDER_ID;
+        if ($this->order_product_id !== $v) {
+            $this->order_product_id = $v;
+            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID;
         }
 
-        if ($this->aOrder !== null && $this->aOrder->getId() !== $v) {
-            $this->aOrder = null;
+        if ($this->aOrderProduct !== null && $this->aOrderProduct->getId() !== $v) {
+            $this->aOrderProduct = null;
         }
 
 
         return $this;
-    } // setOrderId()
+    } // setOrderProductId()
 
     /**
-     * Set the value of [product_ref] column.
+     * Set the value of [attribute_title] column.
      *
      * @param      string $v new value
-     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
      */
-    public function setProductRef($v)
+    public function setAttributeTitle($v)
     {
         if ($v !== null) {
             $v = (string) $v;
         }
 
-        if ($this->product_ref !== $v) {
-            $this->product_ref = $v;
-            $this->modifiedColumns[] = OrderProductTableMap::PRODUCT_REF;
+        if ($this->attribute_title !== $v) {
+            $this->attribute_title = $v;
+            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE;
         }
 
 
         return $this;
-    } // setProductRef()
+    } // setAttributeTitle()
 
     /**
-     * Set the value of [title] column.
+     * Set the value of [attribute_chapo] column.
      *
      * @param      string $v new value
-     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
      */
-    public function setTitle($v)
+    public function setAttributeChapo($v)
     {
         if ($v !== null) {
             $v = (string) $v;
         }
 
-        if ($this->title !== $v) {
-            $this->title = $v;
-            $this->modifiedColumns[] = OrderProductTableMap::TITLE;
+        if ($this->attribute_chapo !== $v) {
+            $this->attribute_chapo = $v;
+            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO;
         }
 
 
         return $this;
-    } // setTitle()
+    } // setAttributeChapo()
 
     /**
-     * Set the value of [description] column.
+     * Set the value of [attribute_description] column.
      *
      * @param      string $v new value
-     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
      */
-    public function setDescription($v)
+    public function setAttributeDescription($v)
     {
         if ($v !== null) {
             $v = (string) $v;
         }
 
-        if ($this->description !== $v) {
-            $this->description = $v;
-            $this->modifiedColumns[] = OrderProductTableMap::DESCRIPTION;
+        if ($this->attribute_description !== $v) {
+            $this->attribute_description = $v;
+            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION;
         }
 
 
         return $this;
-    } // setDescription()
+    } // setAttributeDescription()
 
     /**
-     * Set the value of [chapo] column.
+     * Set the value of [attribute_postscriptumn] column.
      *
      * @param      string $v new value
-     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
      */
-    public function setChapo($v)
+    public function setAttributePostscriptumn($v)
     {
         if ($v !== null) {
             $v = (string) $v;
         }
 
-        if ($this->chapo !== $v) {
-            $this->chapo = $v;
-            $this->modifiedColumns[] = OrderProductTableMap::CHAPO;
+        if ($this->attribute_postscriptumn !== $v) {
+            $this->attribute_postscriptumn = $v;
+            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN;
         }
 
 
         return $this;
-    } // setChapo()
+    } // setAttributePostscriptumn()
 
     /**
-     * Set the value of [quantity] column.
+     * Set the value of [attribute_av_title] column.
      *
-     * @param      double $v new value
-     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
      */
-    public function setQuantity($v)
+    public function setAttributeAvTitle($v)
     {
         if ($v !== null) {
-            $v = (double) $v;
+            $v = (string) $v;
         }
 
-        if ($this->quantity !== $v) {
-            $this->quantity = $v;
-            $this->modifiedColumns[] = OrderProductTableMap::QUANTITY;
+        if ($this->attribute_av_title !== $v) {
+            $this->attribute_av_title = $v;
+            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE;
         }
 
 
         return $this;
-    } // setQuantity()
+    } // setAttributeAvTitle()
 
     /**
-     * Set the value of [price] column.
+     * Set the value of [attribute_av_chapo] column.
      *
-     * @param      double $v new value
-     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
      */
-    public function setPrice($v)
+    public function setAttributeAvChapo($v)
     {
         if ($v !== null) {
-            $v = (double) $v;
+            $v = (string) $v;
         }
 
-        if ($this->price !== $v) {
-            $this->price = $v;
-            $this->modifiedColumns[] = OrderProductTableMap::PRICE;
+        if ($this->attribute_av_chapo !== $v) {
+            $this->attribute_av_chapo = $v;
+            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO;
         }
 
 
         return $this;
-    } // setPrice()
+    } // setAttributeAvChapo()
 
     /**
-     * Set the value of [tax] column.
+     * Set the value of [attribute_av_description] column.
      *
-     * @param      double $v new value
-     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
      */
-    public function setTax($v)
+    public function setAttributeAvDescription($v)
     {
         if ($v !== null) {
-            $v = (double) $v;
+            $v = (string) $v;
         }
 
-        if ($this->tax !== $v) {
-            $this->tax = $v;
-            $this->modifiedColumns[] = OrderProductTableMap::TAX;
+        if ($this->attribute_av_description !== $v) {
+            $this->attribute_av_description = $v;
+            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION;
         }
 
 
         return $this;
-    } // setTax()
+    } // setAttributeAvDescription()
 
     /**
-     * Set the value of [parent] column.
+     * Set the value of [attribute_av_postscriptum] column.
      *
-     * @param      int $v new value
-     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
      */
-    public function setParent($v)
+    public function setAttributeAvPostscriptum($v)
     {
         if ($v !== null) {
-            $v = (int) $v;
+            $v = (string) $v;
         }
 
-        if ($this->parent !== $v) {
-            $this->parent = $v;
-            $this->modifiedColumns[] = OrderProductTableMap::PARENT;
+        if ($this->attribute_av_postscriptum !== $v) {
+            $this->attribute_av_postscriptum = $v;
+            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM;
         }
 
 
         return $this;
-    } // setParent()
+    } // setAttributeAvPostscriptum()
 
     /**
      * Sets the value of [created_at] column to a normalized version of the date/time value specified.
      *
      * @param      mixed $v string, integer (timestamp), or \DateTime value.
      *               Empty strings are treated as NULL.
-     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
      */
     public function setCreatedAt($v)
     {
@@ -787,7 +772,7 @@ abstract class OrderProduct implements ActiveRecordInterface
         if ($this->created_at !== null || $dt !== null) {
             if ($dt !== $this->created_at) {
                 $this->created_at = $dt;
-                $this->modifiedColumns[] = OrderProductTableMap::CREATED_AT;
+                $this->modifiedColumns[] = OrderAttributeCombinationTableMap::CREATED_AT;
             }
         } // if either are not null
 
@@ -800,7 +785,7 @@ abstract class OrderProduct implements ActiveRecordInterface
      *
      * @param      mixed $v string, integer (timestamp), or \DateTime value.
      *               Empty strings are treated as NULL.
-     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
      */
     public function setUpdatedAt($v)
     {
@@ -808,7 +793,7 @@ abstract class OrderProduct implements ActiveRecordInterface
         if ($this->updated_at !== null || $dt !== null) {
             if ($dt !== $this->updated_at) {
                 $this->updated_at = $dt;
-                $this->modifiedColumns[] = OrderProductTableMap::UPDATED_AT;
+                $this->modifiedColumns[] = OrderAttributeCombinationTableMap::UPDATED_AT;
             }
         } // if either are not null
 
@@ -853,43 +838,43 @@ abstract class OrderProduct implements ActiveRecordInterface
         try {
 
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : OrderProductTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
             $this->id = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : OrderProductTableMap::translateFieldName('OrderId', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->order_id = (null !== $col) ? (int) $col : null;
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('OrderProductId', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->order_product_id = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : OrderProductTableMap::translateFieldName('ProductRef', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->product_ref = (null !== $col) ? (string) $col : null;
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeTitle', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->attribute_title = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : OrderProductTableMap::translateFieldName('Title', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->title = (null !== $col) ? (string) $col : null;
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeChapo', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->attribute_chapo = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : OrderProductTableMap::translateFieldName('Description', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->description = (null !== $col) ? (string) $col : null;
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeDescription', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->attribute_description = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : OrderProductTableMap::translateFieldName('Chapo', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->chapo = (null !== $col) ? (string) $col : null;
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributePostscriptumn', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->attribute_postscriptumn = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : OrderProductTableMap::translateFieldName('Quantity', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->quantity = (null !== $col) ? (double) $col : null;
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeAvTitle', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->attribute_av_title = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : OrderProductTableMap::translateFieldName('Price', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->price = (null !== $col) ? (double) $col : null;
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeAvChapo', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->attribute_av_chapo = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : OrderProductTableMap::translateFieldName('Tax', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->tax = (null !== $col) ? (double) $col : null;
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeAvDescription', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->attribute_av_description = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : OrderProductTableMap::translateFieldName('Parent', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->parent = (null !== $col) ? (int) $col : null;
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeAvPostscriptum', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->attribute_av_postscriptum = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : OrderProductTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
             $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : OrderProductTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
@@ -902,10 +887,10 @@ abstract class OrderProduct implements ActiveRecordInterface
                 $this->ensureConsistency();
             }
 
-            return $startcol + 12; // 12 = OrderProductTableMap::NUM_HYDRATE_COLUMNS.
+            return $startcol + 12; // 12 = OrderAttributeCombinationTableMap::NUM_HYDRATE_COLUMNS.
 
         } catch (Exception $e) {
-            throw new PropelException("Error populating \Thelia\Model\OrderProduct object", 0, $e);
+            throw new PropelException("Error populating \Thelia\Model\OrderAttributeCombination object", 0, $e);
         }
     }
 
@@ -924,8 +909,8 @@ abstract class OrderProduct implements ActiveRecordInterface
      */
     public function ensureConsistency()
     {
-        if ($this->aOrder !== null && $this->order_id !== $this->aOrder->getId()) {
-            $this->aOrder = null;
+        if ($this->aOrderProduct !== null && $this->order_product_id !== $this->aOrderProduct->getId()) {
+            $this->aOrderProduct = null;
         }
     } // ensureConsistency
 
@@ -950,13 +935,13 @@ abstract class OrderProduct implements ActiveRecordInterface
         }
 
         if ($con === null) {
-            $con = Propel::getServiceContainer()->getReadConnection(OrderProductTableMap::DATABASE_NAME);
+            $con = Propel::getServiceContainer()->getReadConnection(OrderAttributeCombinationTableMap::DATABASE_NAME);
         }
 
         // We don't need to alter the object instance pool; we're just modifying this instance
         // already in the pool.
 
-        $dataFetcher = ChildOrderProductQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con);
+        $dataFetcher = ChildOrderAttributeCombinationQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con);
         $row = $dataFetcher->fetch();
         $dataFetcher->close();
         if (!$row) {
@@ -966,9 +951,7 @@ abstract class OrderProduct implements ActiveRecordInterface
 
         if ($deep) {  // also de-associate any related objects?
 
-            $this->aOrder = null;
-            $this->collOrderFeatures = null;
-
+            $this->aOrderProduct = null;
         } // if (deep)
     }
 
@@ -978,8 +961,8 @@ abstract class OrderProduct implements ActiveRecordInterface
      * @param      ConnectionInterface $con
      * @return void
      * @throws PropelException
-     * @see OrderProduct::setDeleted()
-     * @see OrderProduct::isDeleted()
+     * @see OrderAttributeCombination::setDeleted()
+     * @see OrderAttributeCombination::isDeleted()
      */
     public function delete(ConnectionInterface $con = null)
     {
@@ -988,12 +971,12 @@ abstract class OrderProduct implements ActiveRecordInterface
         }
 
         if ($con === null) {
-            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductTableMap::DATABASE_NAME);
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderAttributeCombinationTableMap::DATABASE_NAME);
         }
 
         $con->beginTransaction();
         try {
-            $deleteQuery = ChildOrderProductQuery::create()
+            $deleteQuery = ChildOrderAttributeCombinationQuery::create()
                 ->filterByPrimaryKey($this->getPrimaryKey());
             $ret = $this->preDelete($con);
             if ($ret) {
@@ -1030,7 +1013,7 @@ abstract class OrderProduct implements ActiveRecordInterface
         }
 
         if ($con === null) {
-            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductTableMap::DATABASE_NAME);
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderAttributeCombinationTableMap::DATABASE_NAME);
         }
 
         $con->beginTransaction();
@@ -1040,16 +1023,16 @@ abstract class OrderProduct implements ActiveRecordInterface
             if ($isInsert) {
                 $ret = $ret && $this->preInsert($con);
                 // timestampable behavior
-                if (!$this->isColumnModified(OrderProductTableMap::CREATED_AT)) {
+                if (!$this->isColumnModified(OrderAttributeCombinationTableMap::CREATED_AT)) {
                     $this->setCreatedAt(time());
                 }
-                if (!$this->isColumnModified(OrderProductTableMap::UPDATED_AT)) {
+                if (!$this->isColumnModified(OrderAttributeCombinationTableMap::UPDATED_AT)) {
                     $this->setUpdatedAt(time());
                 }
             } else {
                 $ret = $ret && $this->preUpdate($con);
                 // timestampable behavior
-                if ($this->isModified() && !$this->isColumnModified(OrderProductTableMap::UPDATED_AT)) {
+                if ($this->isModified() && !$this->isColumnModified(OrderAttributeCombinationTableMap::UPDATED_AT)) {
                     $this->setUpdatedAt(time());
                 }
             }
@@ -1061,7 +1044,7 @@ abstract class OrderProduct implements ActiveRecordInterface
                     $this->postUpdate($con);
                 }
                 $this->postSave($con);
-                OrderProductTableMap::addInstanceToPool($this);
+                OrderAttributeCombinationTableMap::addInstanceToPool($this);
             } else {
                 $affectedRows = 0;
             }
@@ -1096,11 +1079,11 @@ abstract class OrderProduct implements ActiveRecordInterface
             // method.  This object relates to these object(s) by a
             // foreign key reference.
 
-            if ($this->aOrder !== null) {
-                if ($this->aOrder->isModified() || $this->aOrder->isNew()) {
-                    $affectedRows += $this->aOrder->save($con);
+            if ($this->aOrderProduct !== null) {
+                if ($this->aOrderProduct->isModified() || $this->aOrderProduct->isNew()) {
+                    $affectedRows += $this->aOrderProduct->save($con);
                 }
-                $this->setOrder($this->aOrder);
+                $this->setOrderProduct($this->aOrderProduct);
             }
 
             if ($this->isNew() || $this->isModified()) {
@@ -1114,23 +1097,6 @@ abstract class OrderProduct implements ActiveRecordInterface
                 $this->resetModified();
             }
 
-            if ($this->orderFeaturesScheduledForDeletion !== null) {
-                if (!$this->orderFeaturesScheduledForDeletion->isEmpty()) {
-                    \Thelia\Model\OrderFeatureQuery::create()
-                        ->filterByPrimaryKeys($this->orderFeaturesScheduledForDeletion->getPrimaryKeys(false))
-                        ->delete($con);
-                    $this->orderFeaturesScheduledForDeletion = null;
-                }
-            }
-
-                if ($this->collOrderFeatures !== null) {
-            foreach ($this->collOrderFeatures as $referrerFK) {
-                    if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
-                        $affectedRows += $referrerFK->save($con);
-                    }
-                }
-            }
-
             $this->alreadyInSave = false;
 
         }
@@ -1151,51 +1117,51 @@ abstract class OrderProduct implements ActiveRecordInterface
         $modifiedColumns = array();
         $index = 0;
 
-        $this->modifiedColumns[] = OrderProductTableMap::ID;
+        $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ID;
         if (null !== $this->id) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key (' . OrderProductTableMap::ID . ')');
+            throw new PropelException('Cannot insert a value for auto-increment primary key (' . OrderAttributeCombinationTableMap::ID . ')');
         }
 
          // check the columns in natural order for more readable SQL queries
-        if ($this->isColumnModified(OrderProductTableMap::ID)) {
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ID)) {
             $modifiedColumns[':p' . $index++]  = 'ID';
         }
-        if ($this->isColumnModified(OrderProductTableMap::ORDER_ID)) {
-            $modifiedColumns[':p' . $index++]  = 'ORDER_ID';
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID)) {
+            $modifiedColumns[':p' . $index++]  = 'ORDER_PRODUCT_ID';
         }
-        if ($this->isColumnModified(OrderProductTableMap::PRODUCT_REF)) {
-            $modifiedColumns[':p' . $index++]  = 'PRODUCT_REF';
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE)) {
+            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_TITLE';
         }
-        if ($this->isColumnModified(OrderProductTableMap::TITLE)) {
-            $modifiedColumns[':p' . $index++]  = 'TITLE';
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO)) {
+            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_CHAPO';
         }
-        if ($this->isColumnModified(OrderProductTableMap::DESCRIPTION)) {
-            $modifiedColumns[':p' . $index++]  = 'DESCRIPTION';
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION)) {
+            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_DESCRIPTION';
         }
-        if ($this->isColumnModified(OrderProductTableMap::CHAPO)) {
-            $modifiedColumns[':p' . $index++]  = 'CHAPO';
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN)) {
+            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_POSTSCRIPTUMN';
         }
-        if ($this->isColumnModified(OrderProductTableMap::QUANTITY)) {
-            $modifiedColumns[':p' . $index++]  = 'QUANTITY';
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE)) {
+            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_AV_TITLE';
         }
-        if ($this->isColumnModified(OrderProductTableMap::PRICE)) {
-            $modifiedColumns[':p' . $index++]  = 'PRICE';
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO)) {
+            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_AV_CHAPO';
         }
-        if ($this->isColumnModified(OrderProductTableMap::TAX)) {
-            $modifiedColumns[':p' . $index++]  = 'TAX';
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION)) {
+            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_AV_DESCRIPTION';
         }
-        if ($this->isColumnModified(OrderProductTableMap::PARENT)) {
-            $modifiedColumns[':p' . $index++]  = 'PARENT';
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM)) {
+            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_AV_POSTSCRIPTUM';
         }
-        if ($this->isColumnModified(OrderProductTableMap::CREATED_AT)) {
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::CREATED_AT)) {
             $modifiedColumns[':p' . $index++]  = 'CREATED_AT';
         }
-        if ($this->isColumnModified(OrderProductTableMap::UPDATED_AT)) {
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::UPDATED_AT)) {
             $modifiedColumns[':p' . $index++]  = 'UPDATED_AT';
         }
 
         $sql = sprintf(
-            'INSERT INTO order_product (%s) VALUES (%s)',
+            'INSERT INTO order_attribute_combination (%s) VALUES (%s)',
             implode(', ', $modifiedColumns),
             implode(', ', array_keys($modifiedColumns))
         );
@@ -1207,32 +1173,32 @@ abstract class OrderProduct implements ActiveRecordInterface
                     case 'ID':
                         $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
                         break;
-                    case 'ORDER_ID':
-                        $stmt->bindValue($identifier, $this->order_id, PDO::PARAM_INT);
+                    case 'ORDER_PRODUCT_ID':
+                        $stmt->bindValue($identifier, $this->order_product_id, PDO::PARAM_INT);
                         break;
-                    case 'PRODUCT_REF':
-                        $stmt->bindValue($identifier, $this->product_ref, PDO::PARAM_STR);
+                    case 'ATTRIBUTE_TITLE':
+                        $stmt->bindValue($identifier, $this->attribute_title, PDO::PARAM_STR);
                         break;
-                    case 'TITLE':
-                        $stmt->bindValue($identifier, $this->title, PDO::PARAM_STR);
+                    case 'ATTRIBUTE_CHAPO':
+                        $stmt->bindValue($identifier, $this->attribute_chapo, PDO::PARAM_STR);
                         break;
-                    case 'DESCRIPTION':
-                        $stmt->bindValue($identifier, $this->description, PDO::PARAM_STR);
+                    case 'ATTRIBUTE_DESCRIPTION':
+                        $stmt->bindValue($identifier, $this->attribute_description, PDO::PARAM_STR);
                         break;
-                    case 'CHAPO':
-                        $stmt->bindValue($identifier, $this->chapo, PDO::PARAM_STR);
+                    case 'ATTRIBUTE_POSTSCRIPTUMN':
+                        $stmt->bindValue($identifier, $this->attribute_postscriptumn, PDO::PARAM_STR);
                         break;
-                    case 'QUANTITY':
-                        $stmt->bindValue($identifier, $this->quantity, PDO::PARAM_STR);
+                    case 'ATTRIBUTE_AV_TITLE':
+                        $stmt->bindValue($identifier, $this->attribute_av_title, PDO::PARAM_STR);
                         break;
-                    case 'PRICE':
-                        $stmt->bindValue($identifier, $this->price, PDO::PARAM_STR);
+                    case 'ATTRIBUTE_AV_CHAPO':
+                        $stmt->bindValue($identifier, $this->attribute_av_chapo, PDO::PARAM_STR);
                         break;
-                    case 'TAX':
-                        $stmt->bindValue($identifier, $this->tax, PDO::PARAM_STR);
+                    case 'ATTRIBUTE_AV_DESCRIPTION':
+                        $stmt->bindValue($identifier, $this->attribute_av_description, PDO::PARAM_STR);
                         break;
-                    case 'PARENT':
-                        $stmt->bindValue($identifier, $this->parent, PDO::PARAM_INT);
+                    case 'ATTRIBUTE_AV_POSTSCRIPTUM':
+                        $stmt->bindValue($identifier, $this->attribute_av_postscriptum, PDO::PARAM_STR);
                         break;
                     case 'CREATED_AT':
                         $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
@@ -1286,7 +1252,7 @@ abstract class OrderProduct implements ActiveRecordInterface
      */
     public function getByName($name, $type = TableMap::TYPE_PHPNAME)
     {
-        $pos = OrderProductTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
+        $pos = OrderAttributeCombinationTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
         $field = $this->getByPosition($pos);
 
         return $field;
@@ -1306,31 +1272,31 @@ abstract class OrderProduct implements ActiveRecordInterface
                 return $this->getId();
                 break;
             case 1:
-                return $this->getOrderId();
+                return $this->getOrderProductId();
                 break;
             case 2:
-                return $this->getProductRef();
+                return $this->getAttributeTitle();
                 break;
             case 3:
-                return $this->getTitle();
+                return $this->getAttributeChapo();
                 break;
             case 4:
-                return $this->getDescription();
+                return $this->getAttributeDescription();
                 break;
             case 5:
-                return $this->getChapo();
+                return $this->getAttributePostscriptumn();
                 break;
             case 6:
-                return $this->getQuantity();
+                return $this->getAttributeAvTitle();
                 break;
             case 7:
-                return $this->getPrice();
+                return $this->getAttributeAvChapo();
                 break;
             case 8:
-                return $this->getTax();
+                return $this->getAttributeAvDescription();
                 break;
             case 9:
-                return $this->getParent();
+                return $this->getAttributeAvPostscriptum();
                 break;
             case 10:
                 return $this->getCreatedAt();
@@ -1361,22 +1327,22 @@ abstract class OrderProduct implements ActiveRecordInterface
      */
     public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false)
     {
-        if (isset($alreadyDumpedObjects['OrderProduct'][$this->getPrimaryKey()])) {
+        if (isset($alreadyDumpedObjects['OrderAttributeCombination'][$this->getPrimaryKey()])) {
             return '*RECURSION*';
         }
-        $alreadyDumpedObjects['OrderProduct'][$this->getPrimaryKey()] = true;
-        $keys = OrderProductTableMap::getFieldNames($keyType);
+        $alreadyDumpedObjects['OrderAttributeCombination'][$this->getPrimaryKey()] = true;
+        $keys = OrderAttributeCombinationTableMap::getFieldNames($keyType);
         $result = array(
             $keys[0] => $this->getId(),
-            $keys[1] => $this->getOrderId(),
-            $keys[2] => $this->getProductRef(),
-            $keys[3] => $this->getTitle(),
-            $keys[4] => $this->getDescription(),
-            $keys[5] => $this->getChapo(),
-            $keys[6] => $this->getQuantity(),
-            $keys[7] => $this->getPrice(),
-            $keys[8] => $this->getTax(),
-            $keys[9] => $this->getParent(),
+            $keys[1] => $this->getOrderProductId(),
+            $keys[2] => $this->getAttributeTitle(),
+            $keys[3] => $this->getAttributeChapo(),
+            $keys[4] => $this->getAttributeDescription(),
+            $keys[5] => $this->getAttributePostscriptumn(),
+            $keys[6] => $this->getAttributeAvTitle(),
+            $keys[7] => $this->getAttributeAvChapo(),
+            $keys[8] => $this->getAttributeAvDescription(),
+            $keys[9] => $this->getAttributeAvPostscriptum(),
             $keys[10] => $this->getCreatedAt(),
             $keys[11] => $this->getUpdatedAt(),
         );
@@ -1387,11 +1353,8 @@ abstract class OrderProduct implements ActiveRecordInterface
         }
 
         if ($includeForeignObjects) {
-            if (null !== $this->aOrder) {
-                $result['Order'] = $this->aOrder->toArray($keyType, $includeLazyLoadColumns,  $alreadyDumpedObjects, true);
-            }
-            if (null !== $this->collOrderFeatures) {
-                $result['OrderFeatures'] = $this->collOrderFeatures->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+            if (null !== $this->aOrderProduct) {
+                $result['OrderProduct'] = $this->aOrderProduct->toArray($keyType, $includeLazyLoadColumns,  $alreadyDumpedObjects, true);
             }
         }
 
@@ -1411,7 +1374,7 @@ abstract class OrderProduct implements ActiveRecordInterface
      */
     public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
     {
-        $pos = OrderProductTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
+        $pos = OrderAttributeCombinationTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
 
         return $this->setByPosition($pos, $value);
     }
@@ -1431,31 +1394,31 @@ abstract class OrderProduct implements ActiveRecordInterface
                 $this->setId($value);
                 break;
             case 1:
-                $this->setOrderId($value);
+                $this->setOrderProductId($value);
                 break;
             case 2:
-                $this->setProductRef($value);
+                $this->setAttributeTitle($value);
                 break;
             case 3:
-                $this->setTitle($value);
+                $this->setAttributeChapo($value);
                 break;
             case 4:
-                $this->setDescription($value);
+                $this->setAttributeDescription($value);
                 break;
             case 5:
-                $this->setChapo($value);
+                $this->setAttributePostscriptumn($value);
                 break;
             case 6:
-                $this->setQuantity($value);
+                $this->setAttributeAvTitle($value);
                 break;
             case 7:
-                $this->setPrice($value);
+                $this->setAttributeAvChapo($value);
                 break;
             case 8:
-                $this->setTax($value);
+                $this->setAttributeAvDescription($value);
                 break;
             case 9:
-                $this->setParent($value);
+                $this->setAttributeAvPostscriptum($value);
                 break;
             case 10:
                 $this->setCreatedAt($value);
@@ -1485,18 +1448,18 @@ abstract class OrderProduct implements ActiveRecordInterface
      */
     public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
     {
-        $keys = OrderProductTableMap::getFieldNames($keyType);
+        $keys = OrderAttributeCombinationTableMap::getFieldNames($keyType);
 
         if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
-        if (array_key_exists($keys[1], $arr)) $this->setOrderId($arr[$keys[1]]);
-        if (array_key_exists($keys[2], $arr)) $this->setProductRef($arr[$keys[2]]);
-        if (array_key_exists($keys[3], $arr)) $this->setTitle($arr[$keys[3]]);
-        if (array_key_exists($keys[4], $arr)) $this->setDescription($arr[$keys[4]]);
-        if (array_key_exists($keys[5], $arr)) $this->setChapo($arr[$keys[5]]);
-        if (array_key_exists($keys[6], $arr)) $this->setQuantity($arr[$keys[6]]);
-        if (array_key_exists($keys[7], $arr)) $this->setPrice($arr[$keys[7]]);
-        if (array_key_exists($keys[8], $arr)) $this->setTax($arr[$keys[8]]);
-        if (array_key_exists($keys[9], $arr)) $this->setParent($arr[$keys[9]]);
+        if (array_key_exists($keys[1], $arr)) $this->setOrderProductId($arr[$keys[1]]);
+        if (array_key_exists($keys[2], $arr)) $this->setAttributeTitle($arr[$keys[2]]);
+        if (array_key_exists($keys[3], $arr)) $this->setAttributeChapo($arr[$keys[3]]);
+        if (array_key_exists($keys[4], $arr)) $this->setAttributeDescription($arr[$keys[4]]);
+        if (array_key_exists($keys[5], $arr)) $this->setAttributePostscriptumn($arr[$keys[5]]);
+        if (array_key_exists($keys[6], $arr)) $this->setAttributeAvTitle($arr[$keys[6]]);
+        if (array_key_exists($keys[7], $arr)) $this->setAttributeAvChapo($arr[$keys[7]]);
+        if (array_key_exists($keys[8], $arr)) $this->setAttributeAvDescription($arr[$keys[8]]);
+        if (array_key_exists($keys[9], $arr)) $this->setAttributeAvPostscriptum($arr[$keys[9]]);
         if (array_key_exists($keys[10], $arr)) $this->setCreatedAt($arr[$keys[10]]);
         if (array_key_exists($keys[11], $arr)) $this->setUpdatedAt($arr[$keys[11]]);
     }
@@ -1508,20 +1471,20 @@ abstract class OrderProduct implements ActiveRecordInterface
      */
     public function buildCriteria()
     {
-        $criteria = new Criteria(OrderProductTableMap::DATABASE_NAME);
+        $criteria = new Criteria(OrderAttributeCombinationTableMap::DATABASE_NAME);
 
-        if ($this->isColumnModified(OrderProductTableMap::ID)) $criteria->add(OrderProductTableMap::ID, $this->id);
-        if ($this->isColumnModified(OrderProductTableMap::ORDER_ID)) $criteria->add(OrderProductTableMap::ORDER_ID, $this->order_id);
-        if ($this->isColumnModified(OrderProductTableMap::PRODUCT_REF)) $criteria->add(OrderProductTableMap::PRODUCT_REF, $this->product_ref);
-        if ($this->isColumnModified(OrderProductTableMap::TITLE)) $criteria->add(OrderProductTableMap::TITLE, $this->title);
-        if ($this->isColumnModified(OrderProductTableMap::DESCRIPTION)) $criteria->add(OrderProductTableMap::DESCRIPTION, $this->description);
-        if ($this->isColumnModified(OrderProductTableMap::CHAPO)) $criteria->add(OrderProductTableMap::CHAPO, $this->chapo);
-        if ($this->isColumnModified(OrderProductTableMap::QUANTITY)) $criteria->add(OrderProductTableMap::QUANTITY, $this->quantity);
-        if ($this->isColumnModified(OrderProductTableMap::PRICE)) $criteria->add(OrderProductTableMap::PRICE, $this->price);
-        if ($this->isColumnModified(OrderProductTableMap::TAX)) $criteria->add(OrderProductTableMap::TAX, $this->tax);
-        if ($this->isColumnModified(OrderProductTableMap::PARENT)) $criteria->add(OrderProductTableMap::PARENT, $this->parent);
-        if ($this->isColumnModified(OrderProductTableMap::CREATED_AT)) $criteria->add(OrderProductTableMap::CREATED_AT, $this->created_at);
-        if ($this->isColumnModified(OrderProductTableMap::UPDATED_AT)) $criteria->add(OrderProductTableMap::UPDATED_AT, $this->updated_at);
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ID)) $criteria->add(OrderAttributeCombinationTableMap::ID, $this->id);
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID)) $criteria->add(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, $this->order_product_id);
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE, $this->attribute_title);
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO, $this->attribute_chapo);
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION, $this->attribute_description);
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN, $this->attribute_postscriptumn);
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE, $this->attribute_av_title);
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO, $this->attribute_av_chapo);
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION, $this->attribute_av_description);
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM, $this->attribute_av_postscriptum);
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::CREATED_AT)) $criteria->add(OrderAttributeCombinationTableMap::CREATED_AT, $this->created_at);
+        if ($this->isColumnModified(OrderAttributeCombinationTableMap::UPDATED_AT)) $criteria->add(OrderAttributeCombinationTableMap::UPDATED_AT, $this->updated_at);
 
         return $criteria;
     }
@@ -1536,8 +1499,8 @@ abstract class OrderProduct implements ActiveRecordInterface
      */
     public function buildPkeyCriteria()
     {
-        $criteria = new Criteria(OrderProductTableMap::DATABASE_NAME);
-        $criteria->add(OrderProductTableMap::ID, $this->id);
+        $criteria = new Criteria(OrderAttributeCombinationTableMap::DATABASE_NAME);
+        $criteria->add(OrderAttributeCombinationTableMap::ID, $this->id);
 
         return $criteria;
     }
@@ -1578,38 +1541,24 @@ abstract class OrderProduct implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param      object $copyObj An object of \Thelia\Model\OrderProduct (or compatible) type.
+     * @param      object $copyObj An object of \Thelia\Model\OrderAttributeCombination (or compatible) type.
      * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
      * @param      boolean $makeNew Whether to reset autoincrement PKs and make the object new.
      * @throws PropelException
      */
     public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
     {
-        $copyObj->setOrderId($this->getOrderId());
-        $copyObj->setProductRef($this->getProductRef());
-        $copyObj->setTitle($this->getTitle());
-        $copyObj->setDescription($this->getDescription());
-        $copyObj->setChapo($this->getChapo());
-        $copyObj->setQuantity($this->getQuantity());
-        $copyObj->setPrice($this->getPrice());
-        $copyObj->setTax($this->getTax());
-        $copyObj->setParent($this->getParent());
+        $copyObj->setOrderProductId($this->getOrderProductId());
+        $copyObj->setAttributeTitle($this->getAttributeTitle());
+        $copyObj->setAttributeChapo($this->getAttributeChapo());
+        $copyObj->setAttributeDescription($this->getAttributeDescription());
+        $copyObj->setAttributePostscriptumn($this->getAttributePostscriptumn());
+        $copyObj->setAttributeAvTitle($this->getAttributeAvTitle());
+        $copyObj->setAttributeAvChapo($this->getAttributeAvChapo());
+        $copyObj->setAttributeAvDescription($this->getAttributeAvDescription());
+        $copyObj->setAttributeAvPostscriptum($this->getAttributeAvPostscriptum());
         $copyObj->setCreatedAt($this->getCreatedAt());
         $copyObj->setUpdatedAt($this->getUpdatedAt());
-
-        if ($deepCopy) {
-            // important: temporarily setNew(false) because this affects the behavior of
-            // the getter/setter methods for fkey referrer objects.
-            $copyObj->setNew(false);
-
-            foreach ($this->getOrderFeatures() as $relObj) {
-                if ($relObj !== $this) {  // ensure that we don't try to copy a reference to ourselves
-                    $copyObj->addOrderFeature($relObj->copy($deepCopy));
-                }
-            }
-
-        } // if ($deepCopy)
-
         if ($makeNew) {
             $copyObj->setNew(true);
             $copyObj->setId(NULL); // this is a auto-increment column, so set to default value
@@ -1625,7 +1574,7 @@ abstract class OrderProduct implements ActiveRecordInterface
      * objects.
      *
      * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @return                 \Thelia\Model\OrderProduct Clone of current object.
+     * @return                 \Thelia\Model\OrderAttributeCombination Clone of current object.
      * @throws PropelException
      */
     public function copy($deepCopy = false)
@@ -1639,26 +1588,26 @@ abstract class OrderProduct implements ActiveRecordInterface
     }
 
     /**
-     * Declares an association between this object and a ChildOrder object.
+     * Declares an association between this object and a ChildOrderProduct object.
      *
-     * @param                  ChildOrder $v
-     * @return                 \Thelia\Model\OrderProduct The current object (for fluent API support)
+     * @param                  ChildOrderProduct $v
+     * @return                 \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
      * @throws PropelException
      */
-    public function setOrder(ChildOrder $v = null)
+    public function setOrderProduct(ChildOrderProduct $v = null)
     {
         if ($v === null) {
-            $this->setOrderId(NULL);
+            $this->setOrderProductId(NULL);
         } else {
-            $this->setOrderId($v->getId());
+            $this->setOrderProductId($v->getId());
         }
 
-        $this->aOrder = $v;
+        $this->aOrderProduct = $v;
 
         // Add binding for other direction of this n:n relationship.
-        // If this object has already been added to the ChildOrder object, it will not be re-added.
+        // If this object has already been added to the ChildOrderProduct object, it will not be re-added.
         if ($v !== null) {
-            $v->addOrderProduct($this);
+            $v->addOrderAttributeCombination($this);
         }
 
 
@@ -1667,260 +1616,26 @@ abstract class OrderProduct implements ActiveRecordInterface
 
 
     /**
-     * Get the associated ChildOrder object
+     * Get the associated ChildOrderProduct object
      *
      * @param      ConnectionInterface $con Optional Connection object.
-     * @return                 ChildOrder The associated ChildOrder object.
+     * @return                 ChildOrderProduct The associated ChildOrderProduct object.
      * @throws PropelException
      */
-    public function getOrder(ConnectionInterface $con = null)
+    public function getOrderProduct(ConnectionInterface $con = null)
     {
-        if ($this->aOrder === null && ($this->order_id !== null)) {
-            $this->aOrder = ChildOrderQuery::create()->findPk($this->order_id, $con);
+        if ($this->aOrderProduct === null && ($this->order_product_id !== null)) {
+            $this->aOrderProduct = ChildOrderProductQuery::create()->findPk($this->order_product_id, $con);
             /* The following can be used additionally to
                 guarantee the related object contains a reference
                 to this object.  This level of coupling may, however, be
                 undesirable since it could result in an only partially populated collection
                 in the referenced object.
-                $this->aOrder->addOrderProducts($this);
+                $this->aOrderProduct->addOrderAttributeCombinations($this);
              */
         }
 
-        return $this->aOrder;
-    }
-
-
-    /**
-     * Initializes a collection based on the name of a relation.
-     * Avoids crafting an 'init[$relationName]s' method name
-     * that wouldn't work when StandardEnglishPluralizer is used.
-     *
-     * @param      string $relationName The name of the relation to initialize
-     * @return void
-     */
-    public function initRelation($relationName)
-    {
-        if ('OrderFeature' == $relationName) {
-            return $this->initOrderFeatures();
-        }
-    }
-
-    /**
-     * Clears out the collOrderFeatures collection
-     *
-     * This does not modify the database; however, it will remove any associated objects, causing
-     * them to be refetched by subsequent calls to accessor method.
-     *
-     * @return void
-     * @see        addOrderFeatures()
-     */
-    public function clearOrderFeatures()
-    {
-        $this->collOrderFeatures = null; // important to set this to NULL since that means it is uninitialized
-    }
-
-    /**
-     * Reset is the collOrderFeatures collection loaded partially.
-     */
-    public function resetPartialOrderFeatures($v = true)
-    {
-        $this->collOrderFeaturesPartial = $v;
-    }
-
-    /**
-     * Initializes the collOrderFeatures collection.
-     *
-     * By default this just sets the collOrderFeatures collection to an empty array (like clearcollOrderFeatures());
-     * however, you may wish to override this method in your stub class to provide setting appropriate
-     * to your application -- for example, setting the initial array to the values stored in database.
-     *
-     * @param      boolean $overrideExisting If set to true, the method call initializes
-     *                                        the collection even if it is not empty
-     *
-     * @return void
-     */
-    public function initOrderFeatures($overrideExisting = true)
-    {
-        if (null !== $this->collOrderFeatures && !$overrideExisting) {
-            return;
-        }
-        $this->collOrderFeatures = new ObjectCollection();
-        $this->collOrderFeatures->setModel('\Thelia\Model\OrderFeature');
-    }
-
-    /**
-     * Gets an array of ChildOrderFeature objects which contain a foreign key that references this object.
-     *
-     * If the $criteria is not null, it is used to always fetch the results from the database.
-     * Otherwise the results are fetched from the database the first time, then cached.
-     * Next time the same method is called without $criteria, the cached collection is returned.
-     * If this ChildOrderProduct is new, it will return
-     * an empty collection or the current collection; the criteria is ignored on a new object.
-     *
-     * @param      Criteria $criteria optional Criteria object to narrow the query
-     * @param      ConnectionInterface $con optional connection object
-     * @return Collection|ChildOrderFeature[] List of ChildOrderFeature objects
-     * @throws PropelException
-     */
-    public function getOrderFeatures($criteria = null, ConnectionInterface $con = null)
-    {
-        $partial = $this->collOrderFeaturesPartial && !$this->isNew();
-        if (null === $this->collOrderFeatures || null !== $criteria  || $partial) {
-            if ($this->isNew() && null === $this->collOrderFeatures) {
-                // return empty collection
-                $this->initOrderFeatures();
-            } else {
-                $collOrderFeatures = ChildOrderFeatureQuery::create(null, $criteria)
-                    ->filterByOrderProduct($this)
-                    ->find($con);
-
-                if (null !== $criteria) {
-                    if (false !== $this->collOrderFeaturesPartial && count($collOrderFeatures)) {
-                        $this->initOrderFeatures(false);
-
-                        foreach ($collOrderFeatures as $obj) {
-                            if (false == $this->collOrderFeatures->contains($obj)) {
-                                $this->collOrderFeatures->append($obj);
-                            }
-                        }
-
-                        $this->collOrderFeaturesPartial = true;
-                    }
-
-                    $collOrderFeatures->getInternalIterator()->rewind();
-
-                    return $collOrderFeatures;
-                }
-
-                if ($partial && $this->collOrderFeatures) {
-                    foreach ($this->collOrderFeatures as $obj) {
-                        if ($obj->isNew()) {
-                            $collOrderFeatures[] = $obj;
-                        }
-                    }
-                }
-
-                $this->collOrderFeatures = $collOrderFeatures;
-                $this->collOrderFeaturesPartial = false;
-            }
-        }
-
-        return $this->collOrderFeatures;
-    }
-
-    /**
-     * Sets a collection of OrderFeature objects related by a one-to-many relationship
-     * to the current object.
-     * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
-     * and new objects from the given Propel collection.
-     *
-     * @param      Collection $orderFeatures A Propel collection.
-     * @param      ConnectionInterface $con Optional connection object
-     * @return   ChildOrderProduct The current object (for fluent API support)
-     */
-    public function setOrderFeatures(Collection $orderFeatures, ConnectionInterface $con = null)
-    {
-        $orderFeaturesToDelete = $this->getOrderFeatures(new Criteria(), $con)->diff($orderFeatures);
-
-
-        $this->orderFeaturesScheduledForDeletion = $orderFeaturesToDelete;
-
-        foreach ($orderFeaturesToDelete as $orderFeatureRemoved) {
-            $orderFeatureRemoved->setOrderProduct(null);
-        }
-
-        $this->collOrderFeatures = null;
-        foreach ($orderFeatures as $orderFeature) {
-            $this->addOrderFeature($orderFeature);
-        }
-
-        $this->collOrderFeatures = $orderFeatures;
-        $this->collOrderFeaturesPartial = false;
-
-        return $this;
-    }
-
-    /**
-     * Returns the number of related OrderFeature objects.
-     *
-     * @param      Criteria $criteria
-     * @param      boolean $distinct
-     * @param      ConnectionInterface $con
-     * @return int             Count of related OrderFeature objects.
-     * @throws PropelException
-     */
-    public function countOrderFeatures(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
-    {
-        $partial = $this->collOrderFeaturesPartial && !$this->isNew();
-        if (null === $this->collOrderFeatures || null !== $criteria || $partial) {
-            if ($this->isNew() && null === $this->collOrderFeatures) {
-                return 0;
-            }
-
-            if ($partial && !$criteria) {
-                return count($this->getOrderFeatures());
-            }
-
-            $query = ChildOrderFeatureQuery::create(null, $criteria);
-            if ($distinct) {
-                $query->distinct();
-            }
-
-            return $query
-                ->filterByOrderProduct($this)
-                ->count($con);
-        }
-
-        return count($this->collOrderFeatures);
-    }
-
-    /**
-     * Method called to associate a ChildOrderFeature object to this object
-     * through the ChildOrderFeature foreign key attribute.
-     *
-     * @param    ChildOrderFeature $l ChildOrderFeature
-     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
-     */
-    public function addOrderFeature(ChildOrderFeature $l)
-    {
-        if ($this->collOrderFeatures === null) {
-            $this->initOrderFeatures();
-            $this->collOrderFeaturesPartial = true;
-        }
-
-        if (!in_array($l, $this->collOrderFeatures->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
-            $this->doAddOrderFeature($l);
-        }
-
-        return $this;
-    }
-
-    /**
-     * @param OrderFeature $orderFeature The orderFeature object to add.
-     */
-    protected function doAddOrderFeature($orderFeature)
-    {
-        $this->collOrderFeatures[]= $orderFeature;
-        $orderFeature->setOrderProduct($this);
-    }
-
-    /**
-     * @param  OrderFeature $orderFeature The orderFeature object to remove.
-     * @return ChildOrderProduct The current object (for fluent API support)
-     */
-    public function removeOrderFeature($orderFeature)
-    {
-        if ($this->getOrderFeatures()->contains($orderFeature)) {
-            $this->collOrderFeatures->remove($this->collOrderFeatures->search($orderFeature));
-            if (null === $this->orderFeaturesScheduledForDeletion) {
-                $this->orderFeaturesScheduledForDeletion = clone $this->collOrderFeatures;
-                $this->orderFeaturesScheduledForDeletion->clear();
-            }
-            $this->orderFeaturesScheduledForDeletion[]= clone $orderFeature;
-            $orderFeature->setOrderProduct(null);
-        }
-
-        return $this;
+        return $this->aOrderProduct;
     }
 
     /**
@@ -1929,15 +1644,15 @@ abstract class OrderProduct implements ActiveRecordInterface
     public function clear()
     {
         $this->id = null;
-        $this->order_id = null;
-        $this->product_ref = null;
-        $this->title = null;
-        $this->description = null;
-        $this->chapo = null;
-        $this->quantity = null;
-        $this->price = null;
-        $this->tax = null;
-        $this->parent = null;
+        $this->order_product_id = null;
+        $this->attribute_title = null;
+        $this->attribute_chapo = null;
+        $this->attribute_description = null;
+        $this->attribute_postscriptumn = null;
+        $this->attribute_av_title = null;
+        $this->attribute_av_chapo = null;
+        $this->attribute_av_description = null;
+        $this->attribute_av_postscriptum = null;
         $this->created_at = null;
         $this->updated_at = null;
         $this->alreadyInSave = false;
@@ -1959,18 +1674,9 @@ abstract class OrderProduct implements ActiveRecordInterface
     public function clearAllReferences($deep = false)
     {
         if ($deep) {
-            if ($this->collOrderFeatures) {
-                foreach ($this->collOrderFeatures as $o) {
-                    $o->clearAllReferences($deep);
-                }
-            }
         } // if ($deep)
 
-        if ($this->collOrderFeatures instanceof Collection) {
-            $this->collOrderFeatures->clearIterator();
-        }
-        $this->collOrderFeatures = null;
-        $this->aOrder = null;
+        $this->aOrderProduct = null;
     }
 
     /**
@@ -1980,7 +1686,7 @@ abstract class OrderProduct implements ActiveRecordInterface
      */
     public function __toString()
     {
-        return (string) $this->exportTo(OrderProductTableMap::DEFAULT_STRING_FORMAT);
+        return (string) $this->exportTo(OrderAttributeCombinationTableMap::DEFAULT_STRING_FORMAT);
     }
 
     // timestampable behavior
@@ -1988,11 +1694,11 @@ abstract class OrderProduct implements ActiveRecordInterface
     /**
      * Mark the current object so that the update date doesn't get updated during next save
      *
-     * @return     ChildOrderProduct The current object (for fluent API support)
+     * @return     ChildOrderAttributeCombination The current object (for fluent API support)
      */
     public function keepUpdateDateUnchanged()
     {
-        $this->modifiedColumns[] = OrderProductTableMap::UPDATED_AT;
+        $this->modifiedColumns[] = OrderAttributeCombinationTableMap::UPDATED_AT;
 
         return $this;
     }
diff --git a/core/lib/Thelia/Model/Base/OrderAttributeCombinationQuery.php b/core/lib/Thelia/Model/Base/OrderAttributeCombinationQuery.php
new file mode 100644
index 000000000..0c7e7bfd8
--- /dev/null
+++ b/core/lib/Thelia/Model/Base/OrderAttributeCombinationQuery.php
@@ -0,0 +1,897 @@
+<?php
+
+namespace Thelia\Model\Base;
+
+use \Exception;
+use \PDO;
+use Propel\Runtime\Propel;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
+use Propel\Runtime\ActiveQuery\ModelJoin;
+use Propel\Runtime\Collection\Collection;
+use Propel\Runtime\Collection\ObjectCollection;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Exception\PropelException;
+use Thelia\Model\OrderAttributeCombination as ChildOrderAttributeCombination;
+use Thelia\Model\OrderAttributeCombinationQuery as ChildOrderAttributeCombinationQuery;
+use Thelia\Model\Map\OrderAttributeCombinationTableMap;
+
+/**
+ * Base class that represents a query for the 'order_attribute_combination' table.
+ *
+ *
+ *
+ * @method     ChildOrderAttributeCombinationQuery orderById($order = Criteria::ASC) Order by the id column
+ * @method     ChildOrderAttributeCombinationQuery orderByOrderProductId($order = Criteria::ASC) Order by the order_product_id column
+ * @method     ChildOrderAttributeCombinationQuery orderByAttributeTitle($order = Criteria::ASC) Order by the attribute_title column
+ * @method     ChildOrderAttributeCombinationQuery orderByAttributeChapo($order = Criteria::ASC) Order by the attribute_chapo column
+ * @method     ChildOrderAttributeCombinationQuery orderByAttributeDescription($order = Criteria::ASC) Order by the attribute_description column
+ * @method     ChildOrderAttributeCombinationQuery orderByAttributePostscriptumn($order = Criteria::ASC) Order by the attribute_postscriptumn column
+ * @method     ChildOrderAttributeCombinationQuery orderByAttributeAvTitle($order = Criteria::ASC) Order by the attribute_av_title column
+ * @method     ChildOrderAttributeCombinationQuery orderByAttributeAvChapo($order = Criteria::ASC) Order by the attribute_av_chapo column
+ * @method     ChildOrderAttributeCombinationQuery orderByAttributeAvDescription($order = Criteria::ASC) Order by the attribute_av_description column
+ * @method     ChildOrderAttributeCombinationQuery orderByAttributeAvPostscriptum($order = Criteria::ASC) Order by the attribute_av_postscriptum column
+ * @method     ChildOrderAttributeCombinationQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
+ * @method     ChildOrderAttributeCombinationQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
+ *
+ * @method     ChildOrderAttributeCombinationQuery groupById() Group by the id column
+ * @method     ChildOrderAttributeCombinationQuery groupByOrderProductId() Group by the order_product_id column
+ * @method     ChildOrderAttributeCombinationQuery groupByAttributeTitle() Group by the attribute_title column
+ * @method     ChildOrderAttributeCombinationQuery groupByAttributeChapo() Group by the attribute_chapo column
+ * @method     ChildOrderAttributeCombinationQuery groupByAttributeDescription() Group by the attribute_description column
+ * @method     ChildOrderAttributeCombinationQuery groupByAttributePostscriptumn() Group by the attribute_postscriptumn column
+ * @method     ChildOrderAttributeCombinationQuery groupByAttributeAvTitle() Group by the attribute_av_title column
+ * @method     ChildOrderAttributeCombinationQuery groupByAttributeAvChapo() Group by the attribute_av_chapo column
+ * @method     ChildOrderAttributeCombinationQuery groupByAttributeAvDescription() Group by the attribute_av_description column
+ * @method     ChildOrderAttributeCombinationQuery groupByAttributeAvPostscriptum() Group by the attribute_av_postscriptum column
+ * @method     ChildOrderAttributeCombinationQuery groupByCreatedAt() Group by the created_at column
+ * @method     ChildOrderAttributeCombinationQuery groupByUpdatedAt() Group by the updated_at column
+ *
+ * @method     ChildOrderAttributeCombinationQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
+ * @method     ChildOrderAttributeCombinationQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
+ * @method     ChildOrderAttributeCombinationQuery innerJoin($relation) Adds a INNER JOIN clause to the query
+ *
+ * @method     ChildOrderAttributeCombinationQuery leftJoinOrderProduct($relationAlias = null) Adds a LEFT JOIN clause to the query using the OrderProduct relation
+ * @method     ChildOrderAttributeCombinationQuery rightJoinOrderProduct($relationAlias = null) Adds a RIGHT JOIN clause to the query using the OrderProduct relation
+ * @method     ChildOrderAttributeCombinationQuery innerJoinOrderProduct($relationAlias = null) Adds a INNER JOIN clause to the query using the OrderProduct relation
+ *
+ * @method     ChildOrderAttributeCombination findOne(ConnectionInterface $con = null) Return the first ChildOrderAttributeCombination matching the query
+ * @method     ChildOrderAttributeCombination findOneOrCreate(ConnectionInterface $con = null) Return the first ChildOrderAttributeCombination matching the query, or a new ChildOrderAttributeCombination object populated from the query conditions when no match is found
+ *
+ * @method     ChildOrderAttributeCombination findOneById(int $id) Return the first ChildOrderAttributeCombination filtered by the id column
+ * @method     ChildOrderAttributeCombination findOneByOrderProductId(int $order_product_id) Return the first ChildOrderAttributeCombination filtered by the order_product_id column
+ * @method     ChildOrderAttributeCombination findOneByAttributeTitle(string $attribute_title) Return the first ChildOrderAttributeCombination filtered by the attribute_title column
+ * @method     ChildOrderAttributeCombination findOneByAttributeChapo(string $attribute_chapo) Return the first ChildOrderAttributeCombination filtered by the attribute_chapo column
+ * @method     ChildOrderAttributeCombination findOneByAttributeDescription(string $attribute_description) Return the first ChildOrderAttributeCombination filtered by the attribute_description column
+ * @method     ChildOrderAttributeCombination findOneByAttributePostscriptumn(string $attribute_postscriptumn) Return the first ChildOrderAttributeCombination filtered by the attribute_postscriptumn column
+ * @method     ChildOrderAttributeCombination findOneByAttributeAvTitle(string $attribute_av_title) Return the first ChildOrderAttributeCombination filtered by the attribute_av_title column
+ * @method     ChildOrderAttributeCombination findOneByAttributeAvChapo(string $attribute_av_chapo) Return the first ChildOrderAttributeCombination filtered by the attribute_av_chapo column
+ * @method     ChildOrderAttributeCombination findOneByAttributeAvDescription(string $attribute_av_description) Return the first ChildOrderAttributeCombination filtered by the attribute_av_description column
+ * @method     ChildOrderAttributeCombination findOneByAttributeAvPostscriptum(string $attribute_av_postscriptum) Return the first ChildOrderAttributeCombination filtered by the attribute_av_postscriptum column
+ * @method     ChildOrderAttributeCombination findOneByCreatedAt(string $created_at) Return the first ChildOrderAttributeCombination filtered by the created_at column
+ * @method     ChildOrderAttributeCombination findOneByUpdatedAt(string $updated_at) Return the first ChildOrderAttributeCombination filtered by the updated_at column
+ *
+ * @method     array findById(int $id) Return ChildOrderAttributeCombination objects filtered by the id column
+ * @method     array findByOrderProductId(int $order_product_id) Return ChildOrderAttributeCombination objects filtered by the order_product_id column
+ * @method     array findByAttributeTitle(string $attribute_title) Return ChildOrderAttributeCombination objects filtered by the attribute_title column
+ * @method     array findByAttributeChapo(string $attribute_chapo) Return ChildOrderAttributeCombination objects filtered by the attribute_chapo column
+ * @method     array findByAttributeDescription(string $attribute_description) Return ChildOrderAttributeCombination objects filtered by the attribute_description column
+ * @method     array findByAttributePostscriptumn(string $attribute_postscriptumn) Return ChildOrderAttributeCombination objects filtered by the attribute_postscriptumn column
+ * @method     array findByAttributeAvTitle(string $attribute_av_title) Return ChildOrderAttributeCombination objects filtered by the attribute_av_title column
+ * @method     array findByAttributeAvChapo(string $attribute_av_chapo) Return ChildOrderAttributeCombination objects filtered by the attribute_av_chapo column
+ * @method     array findByAttributeAvDescription(string $attribute_av_description) Return ChildOrderAttributeCombination objects filtered by the attribute_av_description column
+ * @method     array findByAttributeAvPostscriptum(string $attribute_av_postscriptum) Return ChildOrderAttributeCombination objects filtered by the attribute_av_postscriptum column
+ * @method     array findByCreatedAt(string $created_at) Return ChildOrderAttributeCombination objects filtered by the created_at column
+ * @method     array findByUpdatedAt(string $updated_at) Return ChildOrderAttributeCombination objects filtered by the updated_at column
+ *
+ */
+abstract class OrderAttributeCombinationQuery extends ModelCriteria
+{
+
+    /**
+     * Initializes internal state of \Thelia\Model\Base\OrderAttributeCombinationQuery object.
+     *
+     * @param     string $dbName The database name
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
+     */
+    public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\OrderAttributeCombination', $modelAlias = null)
+    {
+        parent::__construct($dbName, $modelName, $modelAlias);
+    }
+
+    /**
+     * Returns a new ChildOrderAttributeCombinationQuery object.
+     *
+     * @param     string $modelAlias The alias of a model in the query
+     * @param     Criteria $criteria Optional Criteria to build the query from
+     *
+     * @return ChildOrderAttributeCombinationQuery
+     */
+    public static function create($modelAlias = null, $criteria = null)
+    {
+        if ($criteria instanceof \Thelia\Model\OrderAttributeCombinationQuery) {
+            return $criteria;
+        }
+        $query = new \Thelia\Model\OrderAttributeCombinationQuery();
+        if (null !== $modelAlias) {
+            $query->setModelAlias($modelAlias);
+        }
+        if ($criteria instanceof Criteria) {
+            $query->mergeWith($criteria);
+        }
+
+        return $query;
+    }
+
+    /**
+     * Find object by primary key.
+     * Propel uses the instance pool to skip the database if the object exists.
+     * Go fast if the query is untouched.
+     *
+     * <code>
+     * $obj  = $c->findPk(12, $con);
+     * </code>
+     *
+     * @param mixed $key Primary key to use for the query
+     * @param ConnectionInterface $con an optional connection object
+     *
+     * @return ChildOrderAttributeCombination|array|mixed the result, formatted by the current formatter
+     */
+    public function findPk($key, $con = null)
+    {
+        if ($key === null) {
+            return null;
+        }
+        if ((null !== ($obj = OrderAttributeCombinationTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
+            // the object is already in the instance pool
+            return $obj;
+        }
+        if ($con === null) {
+            $con = Propel::getServiceContainer()->getReadConnection(OrderAttributeCombinationTableMap::DATABASE_NAME);
+        }
+        $this->basePreSelect($con);
+        if ($this->formatter || $this->modelAlias || $this->with || $this->select
+         || $this->selectColumns || $this->asColumns || $this->selectModifiers
+         || $this->map || $this->having || $this->joins) {
+            return $this->findPkComplex($key, $con);
+        } else {
+            return $this->findPkSimple($key, $con);
+        }
+    }
+
+    /**
+     * Find object by primary key using raw SQL to go fast.
+     * Bypass doSelect() and the object formatter by using generated code.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     ConnectionInterface $con A connection object
+     *
+     * @return   ChildOrderAttributeCombination A model object, or null if the key is not found
+     */
+    protected function findPkSimple($key, $con)
+    {
+        $sql = 'SELECT ID, ORDER_PRODUCT_ID, ATTRIBUTE_TITLE, ATTRIBUTE_CHAPO, ATTRIBUTE_DESCRIPTION, ATTRIBUTE_POSTSCRIPTUMN, ATTRIBUTE_AV_TITLE, ATTRIBUTE_AV_CHAPO, ATTRIBUTE_AV_DESCRIPTION, ATTRIBUTE_AV_POSTSCRIPTUM, CREATED_AT, UPDATED_AT FROM order_attribute_combination WHERE ID = :p0';
+        try {
+            $stmt = $con->prepare($sql);
+            $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
+        }
+        $obj = null;
+        if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
+            $obj = new ChildOrderAttributeCombination();
+            $obj->hydrate($row);
+            OrderAttributeCombinationTableMap::addInstanceToPool($obj, (string) $key);
+        }
+        $stmt->closeCursor();
+
+        return $obj;
+    }
+
+    /**
+     * Find object by primary key.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     ConnectionInterface $con A connection object
+     *
+     * @return ChildOrderAttributeCombination|array|mixed the result, formatted by the current formatter
+     */
+    protected function findPkComplex($key, $con)
+    {
+        // As the query uses a PK condition, no limit(1) is necessary.
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $dataFetcher = $criteria
+            ->filterByPrimaryKey($key)
+            ->doSelect($con);
+
+        return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher);
+    }
+
+    /**
+     * Find objects by primary key
+     * <code>
+     * $objs = $c->findPks(array(12, 56, 832), $con);
+     * </code>
+     * @param     array $keys Primary keys to use for the query
+     * @param     ConnectionInterface $con an optional connection object
+     *
+     * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
+     */
+    public function findPks($keys, $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getReadConnection($this->getDbName());
+        }
+        $this->basePreSelect($con);
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $dataFetcher = $criteria
+            ->filterByPrimaryKeys($keys)
+            ->doSelect($con);
+
+        return $criteria->getFormatter()->init($criteria)->format($dataFetcher);
+    }
+
+    /**
+     * Filter the query by primary key
+     *
+     * @param     mixed $key Primary key to use for the query
+     *
+     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByPrimaryKey($key)
+    {
+
+        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ID, $key, Criteria::EQUAL);
+    }
+
+    /**
+     * Filter the query by a list of primary keys
+     *
+     * @param     array $keys The list of primary key to use for the query
+     *
+     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByPrimaryKeys($keys)
+    {
+
+        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ID, $keys, Criteria::IN);
+    }
+
+    /**
+     * Filter the query on the id column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterById(1234); // WHERE id = 1234
+     * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
+     * $query->filterById(array('min' => 12)); // WHERE id > 12
+     * </code>
+     *
+     * @param     mixed $id The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterById($id = null, $comparison = null)
+    {
+        if (is_array($id)) {
+            $useMinMax = false;
+            if (isset($id['min'])) {
+                $this->addUsingAlias(OrderAttributeCombinationTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($id['max'])) {
+                $this->addUsingAlias(OrderAttributeCombinationTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ID, $id, $comparison);
+    }
+
+    /**
+     * Filter the query on the order_product_id column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByOrderProductId(1234); // WHERE order_product_id = 1234
+     * $query->filterByOrderProductId(array(12, 34)); // WHERE order_product_id IN (12, 34)
+     * $query->filterByOrderProductId(array('min' => 12)); // WHERE order_product_id > 12
+     * </code>
+     *
+     * @see       filterByOrderProduct()
+     *
+     * @param     mixed $orderProductId The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByOrderProductId($orderProductId = null, $comparison = null)
+    {
+        if (is_array($orderProductId)) {
+            $useMinMax = false;
+            if (isset($orderProductId['min'])) {
+                $this->addUsingAlias(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProductId['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($orderProductId['max'])) {
+                $this->addUsingAlias(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProductId['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProductId, $comparison);
+    }
+
+    /**
+     * Filter the query on the attribute_title column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByAttributeTitle('fooValue');   // WHERE attribute_title = 'fooValue'
+     * $query->filterByAttributeTitle('%fooValue%'); // WHERE attribute_title LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $attributeTitle The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByAttributeTitle($attributeTitle = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($attributeTitle)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $attributeTitle)) {
+                $attributeTitle = str_replace('*', '%', $attributeTitle);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE, $attributeTitle, $comparison);
+    }
+
+    /**
+     * Filter the query on the attribute_chapo column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByAttributeChapo('fooValue');   // WHERE attribute_chapo = 'fooValue'
+     * $query->filterByAttributeChapo('%fooValue%'); // WHERE attribute_chapo LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $attributeChapo The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByAttributeChapo($attributeChapo = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($attributeChapo)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $attributeChapo)) {
+                $attributeChapo = str_replace('*', '%', $attributeChapo);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO, $attributeChapo, $comparison);
+    }
+
+    /**
+     * Filter the query on the attribute_description column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByAttributeDescription('fooValue');   // WHERE attribute_description = 'fooValue'
+     * $query->filterByAttributeDescription('%fooValue%'); // WHERE attribute_description LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $attributeDescription The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByAttributeDescription($attributeDescription = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($attributeDescription)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $attributeDescription)) {
+                $attributeDescription = str_replace('*', '%', $attributeDescription);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION, $attributeDescription, $comparison);
+    }
+
+    /**
+     * Filter the query on the attribute_postscriptumn column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByAttributePostscriptumn('fooValue');   // WHERE attribute_postscriptumn = 'fooValue'
+     * $query->filterByAttributePostscriptumn('%fooValue%'); // WHERE attribute_postscriptumn LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $attributePostscriptumn The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByAttributePostscriptumn($attributePostscriptumn = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($attributePostscriptumn)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $attributePostscriptumn)) {
+                $attributePostscriptumn = str_replace('*', '%', $attributePostscriptumn);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN, $attributePostscriptumn, $comparison);
+    }
+
+    /**
+     * Filter the query on the attribute_av_title column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByAttributeAvTitle('fooValue');   // WHERE attribute_av_title = 'fooValue'
+     * $query->filterByAttributeAvTitle('%fooValue%'); // WHERE attribute_av_title LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $attributeAvTitle The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByAttributeAvTitle($attributeAvTitle = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($attributeAvTitle)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $attributeAvTitle)) {
+                $attributeAvTitle = str_replace('*', '%', $attributeAvTitle);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE, $attributeAvTitle, $comparison);
+    }
+
+    /**
+     * Filter the query on the attribute_av_chapo column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByAttributeAvChapo('fooValue');   // WHERE attribute_av_chapo = 'fooValue'
+     * $query->filterByAttributeAvChapo('%fooValue%'); // WHERE attribute_av_chapo LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $attributeAvChapo The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByAttributeAvChapo($attributeAvChapo = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($attributeAvChapo)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $attributeAvChapo)) {
+                $attributeAvChapo = str_replace('*', '%', $attributeAvChapo);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO, $attributeAvChapo, $comparison);
+    }
+
+    /**
+     * Filter the query on the attribute_av_description column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByAttributeAvDescription('fooValue');   // WHERE attribute_av_description = 'fooValue'
+     * $query->filterByAttributeAvDescription('%fooValue%'); // WHERE attribute_av_description LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $attributeAvDescription The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByAttributeAvDescription($attributeAvDescription = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($attributeAvDescription)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $attributeAvDescription)) {
+                $attributeAvDescription = str_replace('*', '%', $attributeAvDescription);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION, $attributeAvDescription, $comparison);
+    }
+
+    /**
+     * Filter the query on the attribute_av_postscriptum column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByAttributeAvPostscriptum('fooValue');   // WHERE attribute_av_postscriptum = 'fooValue'
+     * $query->filterByAttributeAvPostscriptum('%fooValue%'); // WHERE attribute_av_postscriptum LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $attributeAvPostscriptum The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByAttributeAvPostscriptum($attributeAvPostscriptum = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($attributeAvPostscriptum)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $attributeAvPostscriptum)) {
+                $attributeAvPostscriptum = str_replace('*', '%', $attributeAvPostscriptum);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM, $attributeAvPostscriptum, $comparison);
+    }
+
+    /**
+     * Filter the query on the created_at column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14'
+     * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14'
+     * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
+     * </code>
+     *
+     * @param     mixed $createdAt The value to use as filter.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Empty strings are treated as NULL.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByCreatedAt($createdAt = null, $comparison = null)
+    {
+        if (is_array($createdAt)) {
+            $useMinMax = false;
+            if (isset($createdAt['min'])) {
+                $this->addUsingAlias(OrderAttributeCombinationTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($createdAt['max'])) {
+                $this->addUsingAlias(OrderAttributeCombinationTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderAttributeCombinationTableMap::CREATED_AT, $createdAt, $comparison);
+    }
+
+    /**
+     * Filter the query on the updated_at column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14'
+     * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14'
+     * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
+     * </code>
+     *
+     * @param     mixed $updatedAt The value to use as filter.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Empty strings are treated as NULL.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByUpdatedAt($updatedAt = null, $comparison = null)
+    {
+        if (is_array($updatedAt)) {
+            $useMinMax = false;
+            if (isset($updatedAt['min'])) {
+                $this->addUsingAlias(OrderAttributeCombinationTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($updatedAt['max'])) {
+                $this->addUsingAlias(OrderAttributeCombinationTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderAttributeCombinationTableMap::UPDATED_AT, $updatedAt, $comparison);
+    }
+
+    /**
+     * Filter the query by a related \Thelia\Model\OrderProduct object
+     *
+     * @param \Thelia\Model\OrderProduct|ObjectCollection $orderProduct The related object(s) to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByOrderProduct($orderProduct, $comparison = null)
+    {
+        if ($orderProduct instanceof \Thelia\Model\OrderProduct) {
+            return $this
+                ->addUsingAlias(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProduct->getId(), $comparison);
+        } elseif ($orderProduct instanceof ObjectCollection) {
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+
+            return $this
+                ->addUsingAlias(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProduct->toKeyValue('PrimaryKey', 'Id'), $comparison);
+        } else {
+            throw new PropelException('filterByOrderProduct() only accepts arguments of type \Thelia\Model\OrderProduct or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the OrderProduct relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function joinOrderProduct($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('OrderProduct');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'OrderProduct');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the OrderProduct relation OrderProduct object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return   \Thelia\Model\OrderProductQuery A secondary query class using the current class as primary query
+     */
+    public function useOrderProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        return $this
+            ->joinOrderProduct($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'OrderProduct', '\Thelia\Model\OrderProductQuery');
+    }
+
+    /**
+     * Exclude object from result
+     *
+     * @param   ChildOrderAttributeCombination $orderAttributeCombination Object to remove from the list of results
+     *
+     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function prune($orderAttributeCombination = null)
+    {
+        if ($orderAttributeCombination) {
+            $this->addUsingAlias(OrderAttributeCombinationTableMap::ID, $orderAttributeCombination->getId(), Criteria::NOT_EQUAL);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Deletes all rows from the order_attribute_combination table.
+     *
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).
+     */
+    public function doDeleteAll(ConnectionInterface $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderAttributeCombinationTableMap::DATABASE_NAME);
+        }
+        $affectedRows = 0; // initialize var to track total num of affected rows
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table or we could emulating ON DELETE CASCADE, etc.
+            $con->beginTransaction();
+            $affectedRows += parent::doDeleteAll($con);
+            // Because this db requires some delete cascade/set null emulation, we have to
+            // clear the cached instance *after* the emulation has happened (since
+            // instances get re-added by the select statement contained therein).
+            OrderAttributeCombinationTableMap::clearInstancePool();
+            OrderAttributeCombinationTableMap::clearRelatedInstancePool();
+
+            $con->commit();
+        } catch (PropelException $e) {
+            $con->rollBack();
+            throw $e;
+        }
+
+        return $affectedRows;
+    }
+
+    /**
+     * Performs a DELETE on the database, given a ChildOrderAttributeCombination or Criteria object OR a primary key value.
+     *
+     * @param mixed               $values Criteria or ChildOrderAttributeCombination object or primary key or array of primary keys
+     *              which is used to create the DELETE statement
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     *                if supported by native driver or if emulated using Propel.
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+     public function delete(ConnectionInterface $con = null)
+     {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderAttributeCombinationTableMap::DATABASE_NAME);
+        }
+
+        $criteria = $this;
+
+        // Set the correct dbName
+        $criteria->setDbName(OrderAttributeCombinationTableMap::DATABASE_NAME);
+
+        $affectedRows = 0; // initialize var to track total num of affected rows
+
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table or we could emulating ON DELETE CASCADE, etc.
+            $con->beginTransaction();
+
+
+        OrderAttributeCombinationTableMap::removeInstanceFromPool($criteria);
+
+            $affectedRows += ModelCriteria::delete($con);
+            OrderAttributeCombinationTableMap::clearRelatedInstancePool();
+            $con->commit();
+
+            return $affectedRows;
+        } catch (PropelException $e) {
+            $con->rollBack();
+            throw $e;
+        }
+    }
+
+    // timestampable behavior
+
+    /**
+     * Filter by the latest updated
+     *
+     * @param      int $nbDays Maximum age of the latest update in days
+     *
+     * @return     ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function recentlyUpdated($nbDays = 7)
+    {
+        return $this->addUsingAlias(OrderAttributeCombinationTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+    }
+
+    /**
+     * Filter by the latest created
+     *
+     * @param      int $nbDays Maximum age of in days
+     *
+     * @return     ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function recentlyCreated($nbDays = 7)
+    {
+        return $this->addUsingAlias(OrderAttributeCombinationTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+    }
+
+    /**
+     * Order by update date desc
+     *
+     * @return     ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function lastUpdatedFirst()
+    {
+        return $this->addDescendingOrderByColumn(OrderAttributeCombinationTableMap::UPDATED_AT);
+    }
+
+    /**
+     * Order by update date asc
+     *
+     * @return     ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function firstUpdatedFirst()
+    {
+        return $this->addAscendingOrderByColumn(OrderAttributeCombinationTableMap::UPDATED_AT);
+    }
+
+    /**
+     * Order by create date desc
+     *
+     * @return     ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function lastCreatedFirst()
+    {
+        return $this->addDescendingOrderByColumn(OrderAttributeCombinationTableMap::CREATED_AT);
+    }
+
+    /**
+     * Order by create date asc
+     *
+     * @return     ChildOrderAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function firstCreatedFirst()
+    {
+        return $this->addAscendingOrderByColumn(OrderAttributeCombinationTableMap::CREATED_AT);
+    }
+
+} // OrderAttributeCombinationQuery
diff --git a/core/lib/Thelia/Model/Base/OrderProductQuery.php b/core/lib/Thelia/Model/Base/OrderProductQuery.php
deleted file mode 100644
index b007c89e1..000000000
--- a/core/lib/Thelia/Model/Base/OrderProductQuery.php
+++ /dev/null
@@ -1,1022 +0,0 @@
-<?php
-
-namespace Thelia\Model\Base;
-
-use \Exception;
-use \PDO;
-use Propel\Runtime\Propel;
-use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\ModelCriteria;
-use Propel\Runtime\ActiveQuery\ModelJoin;
-use Propel\Runtime\Collection\Collection;
-use Propel\Runtime\Collection\ObjectCollection;
-use Propel\Runtime\Connection\ConnectionInterface;
-use Propel\Runtime\Exception\PropelException;
-use Thelia\Model\OrderProduct as ChildOrderProduct;
-use Thelia\Model\OrderProductQuery as ChildOrderProductQuery;
-use Thelia\Model\Map\OrderProductTableMap;
-
-/**
- * Base class that represents a query for the 'order_product' table.
- *
- *
- *
- * @method     ChildOrderProductQuery orderById($order = Criteria::ASC) Order by the id column
- * @method     ChildOrderProductQuery orderByOrderId($order = Criteria::ASC) Order by the order_id column
- * @method     ChildOrderProductQuery orderByProductRef($order = Criteria::ASC) Order by the product_ref column
- * @method     ChildOrderProductQuery orderByTitle($order = Criteria::ASC) Order by the title column
- * @method     ChildOrderProductQuery orderByDescription($order = Criteria::ASC) Order by the description column
- * @method     ChildOrderProductQuery orderByChapo($order = Criteria::ASC) Order by the chapo column
- * @method     ChildOrderProductQuery orderByQuantity($order = Criteria::ASC) Order by the quantity column
- * @method     ChildOrderProductQuery orderByPrice($order = Criteria::ASC) Order by the price column
- * @method     ChildOrderProductQuery orderByTax($order = Criteria::ASC) Order by the tax column
- * @method     ChildOrderProductQuery orderByParent($order = Criteria::ASC) Order by the parent column
- * @method     ChildOrderProductQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
- * @method     ChildOrderProductQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
- *
- * @method     ChildOrderProductQuery groupById() Group by the id column
- * @method     ChildOrderProductQuery groupByOrderId() Group by the order_id column
- * @method     ChildOrderProductQuery groupByProductRef() Group by the product_ref column
- * @method     ChildOrderProductQuery groupByTitle() Group by the title column
- * @method     ChildOrderProductQuery groupByDescription() Group by the description column
- * @method     ChildOrderProductQuery groupByChapo() Group by the chapo column
- * @method     ChildOrderProductQuery groupByQuantity() Group by the quantity column
- * @method     ChildOrderProductQuery groupByPrice() Group by the price column
- * @method     ChildOrderProductQuery groupByTax() Group by the tax column
- * @method     ChildOrderProductQuery groupByParent() Group by the parent column
- * @method     ChildOrderProductQuery groupByCreatedAt() Group by the created_at column
- * @method     ChildOrderProductQuery groupByUpdatedAt() Group by the updated_at column
- *
- * @method     ChildOrderProductQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
- * @method     ChildOrderProductQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
- * @method     ChildOrderProductQuery innerJoin($relation) Adds a INNER JOIN clause to the query
- *
- * @method     ChildOrderProductQuery leftJoinOrder($relationAlias = null) Adds a LEFT JOIN clause to the query using the Order relation
- * @method     ChildOrderProductQuery rightJoinOrder($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Order relation
- * @method     ChildOrderProductQuery innerJoinOrder($relationAlias = null) Adds a INNER JOIN clause to the query using the Order relation
- *
- * @method     ChildOrderProductQuery leftJoinOrderFeature($relationAlias = null) Adds a LEFT JOIN clause to the query using the OrderFeature relation
- * @method     ChildOrderProductQuery rightJoinOrderFeature($relationAlias = null) Adds a RIGHT JOIN clause to the query using the OrderFeature relation
- * @method     ChildOrderProductQuery innerJoinOrderFeature($relationAlias = null) Adds a INNER JOIN clause to the query using the OrderFeature relation
- *
- * @method     ChildOrderProduct findOne(ConnectionInterface $con = null) Return the first ChildOrderProduct matching the query
- * @method     ChildOrderProduct findOneOrCreate(ConnectionInterface $con = null) Return the first ChildOrderProduct matching the query, or a new ChildOrderProduct object populated from the query conditions when no match is found
- *
- * @method     ChildOrderProduct findOneById(int $id) Return the first ChildOrderProduct filtered by the id column
- * @method     ChildOrderProduct findOneByOrderId(int $order_id) Return the first ChildOrderProduct filtered by the order_id column
- * @method     ChildOrderProduct findOneByProductRef(string $product_ref) Return the first ChildOrderProduct filtered by the product_ref column
- * @method     ChildOrderProduct findOneByTitle(string $title) Return the first ChildOrderProduct filtered by the title column
- * @method     ChildOrderProduct findOneByDescription(string $description) Return the first ChildOrderProduct filtered by the description column
- * @method     ChildOrderProduct findOneByChapo(string $chapo) Return the first ChildOrderProduct filtered by the chapo column
- * @method     ChildOrderProduct findOneByQuantity(double $quantity) Return the first ChildOrderProduct filtered by the quantity column
- * @method     ChildOrderProduct findOneByPrice(double $price) Return the first ChildOrderProduct filtered by the price column
- * @method     ChildOrderProduct findOneByTax(double $tax) Return the first ChildOrderProduct filtered by the tax column
- * @method     ChildOrderProduct findOneByParent(int $parent) Return the first ChildOrderProduct filtered by the parent column
- * @method     ChildOrderProduct findOneByCreatedAt(string $created_at) Return the first ChildOrderProduct filtered by the created_at column
- * @method     ChildOrderProduct findOneByUpdatedAt(string $updated_at) Return the first ChildOrderProduct filtered by the updated_at column
- *
- * @method     array findById(int $id) Return ChildOrderProduct objects filtered by the id column
- * @method     array findByOrderId(int $order_id) Return ChildOrderProduct objects filtered by the order_id column
- * @method     array findByProductRef(string $product_ref) Return ChildOrderProduct objects filtered by the product_ref column
- * @method     array findByTitle(string $title) Return ChildOrderProduct objects filtered by the title column
- * @method     array findByDescription(string $description) Return ChildOrderProduct objects filtered by the description column
- * @method     array findByChapo(string $chapo) Return ChildOrderProduct objects filtered by the chapo column
- * @method     array findByQuantity(double $quantity) Return ChildOrderProduct objects filtered by the quantity column
- * @method     array findByPrice(double $price) Return ChildOrderProduct objects filtered by the price column
- * @method     array findByTax(double $tax) Return ChildOrderProduct objects filtered by the tax column
- * @method     array findByParent(int $parent) Return ChildOrderProduct objects filtered by the parent column
- * @method     array findByCreatedAt(string $created_at) Return ChildOrderProduct objects filtered by the created_at column
- * @method     array findByUpdatedAt(string $updated_at) Return ChildOrderProduct objects filtered by the updated_at column
- *
- */
-abstract class OrderProductQuery extends ModelCriteria
-{
-
-    /**
-     * Initializes internal state of \Thelia\Model\Base\OrderProductQuery object.
-     *
-     * @param     string $dbName The database name
-     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
-     */
-    public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\OrderProduct', $modelAlias = null)
-    {
-        parent::__construct($dbName, $modelName, $modelAlias);
-    }
-
-    /**
-     * Returns a new ChildOrderProductQuery object.
-     *
-     * @param     string $modelAlias The alias of a model in the query
-     * @param     Criteria $criteria Optional Criteria to build the query from
-     *
-     * @return ChildOrderProductQuery
-     */
-    public static function create($modelAlias = null, $criteria = null)
-    {
-        if ($criteria instanceof \Thelia\Model\OrderProductQuery) {
-            return $criteria;
-        }
-        $query = new \Thelia\Model\OrderProductQuery();
-        if (null !== $modelAlias) {
-            $query->setModelAlias($modelAlias);
-        }
-        if ($criteria instanceof Criteria) {
-            $query->mergeWith($criteria);
-        }
-
-        return $query;
-    }
-
-    /**
-     * Find object by primary key.
-     * Propel uses the instance pool to skip the database if the object exists.
-     * Go fast if the query is untouched.
-     *
-     * <code>
-     * $obj  = $c->findPk(12, $con);
-     * </code>
-     *
-     * @param mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con an optional connection object
-     *
-     * @return ChildOrderProduct|array|mixed the result, formatted by the current formatter
-     */
-    public function findPk($key, $con = null)
-    {
-        if ($key === null) {
-            return null;
-        }
-        if ((null !== ($obj = OrderProductTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
-            // the object is already in the instance pool
-            return $obj;
-        }
-        if ($con === null) {
-            $con = Propel::getServiceContainer()->getReadConnection(OrderProductTableMap::DATABASE_NAME);
-        }
-        $this->basePreSelect($con);
-        if ($this->formatter || $this->modelAlias || $this->with || $this->select
-         || $this->selectColumns || $this->asColumns || $this->selectModifiers
-         || $this->map || $this->having || $this->joins) {
-            return $this->findPkComplex($key, $con);
-        } else {
-            return $this->findPkSimple($key, $con);
-        }
-    }
-
-    /**
-     * Find object by primary key using raw SQL to go fast.
-     * Bypass doSelect() and the object formatter by using generated code.
-     *
-     * @param     mixed $key Primary key to use for the query
-     * @param     ConnectionInterface $con A connection object
-     *
-     * @return   ChildOrderProduct A model object, or null if the key is not found
-     */
-    protected function findPkSimple($key, $con)
-    {
-        $sql = 'SELECT ID, ORDER_ID, PRODUCT_REF, TITLE, DESCRIPTION, CHAPO, QUANTITY, PRICE, TAX, PARENT, CREATED_AT, UPDATED_AT FROM order_product WHERE ID = :p0';
-        try {
-            $stmt = $con->prepare($sql);
-            $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
-            $stmt->execute();
-        } catch (Exception $e) {
-            Propel::log($e->getMessage(), Propel::LOG_ERR);
-            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
-        }
-        $obj = null;
-        if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
-            $obj = new ChildOrderProduct();
-            $obj->hydrate($row);
-            OrderProductTableMap::addInstanceToPool($obj, (string) $key);
-        }
-        $stmt->closeCursor();
-
-        return $obj;
-    }
-
-    /**
-     * Find object by primary key.
-     *
-     * @param     mixed $key Primary key to use for the query
-     * @param     ConnectionInterface $con A connection object
-     *
-     * @return ChildOrderProduct|array|mixed the result, formatted by the current formatter
-     */
-    protected function findPkComplex($key, $con)
-    {
-        // As the query uses a PK condition, no limit(1) is necessary.
-        $criteria = $this->isKeepQuery() ? clone $this : $this;
-        $dataFetcher = $criteria
-            ->filterByPrimaryKey($key)
-            ->doSelect($con);
-
-        return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher);
-    }
-
-    /**
-     * Find objects by primary key
-     * <code>
-     * $objs = $c->findPks(array(12, 56, 832), $con);
-     * </code>
-     * @param     array $keys Primary keys to use for the query
-     * @param     ConnectionInterface $con an optional connection object
-     *
-     * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
-     */
-    public function findPks($keys, $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getReadConnection($this->getDbName());
-        }
-        $this->basePreSelect($con);
-        $criteria = $this->isKeepQuery() ? clone $this : $this;
-        $dataFetcher = $criteria
-            ->filterByPrimaryKeys($keys)
-            ->doSelect($con);
-
-        return $criteria->getFormatter()->init($criteria)->format($dataFetcher);
-    }
-
-    /**
-     * Filter the query by primary key
-     *
-     * @param     mixed $key Primary key to use for the query
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function filterByPrimaryKey($key)
-    {
-
-        return $this->addUsingAlias(OrderProductTableMap::ID, $key, Criteria::EQUAL);
-    }
-
-    /**
-     * Filter the query by a list of primary keys
-     *
-     * @param     array $keys The list of primary key to use for the query
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function filterByPrimaryKeys($keys)
-    {
-
-        return $this->addUsingAlias(OrderProductTableMap::ID, $keys, Criteria::IN);
-    }
-
-    /**
-     * Filter the query on the id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterById(1234); // WHERE id = 1234
-     * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
-     * $query->filterById(array('min' => 12)); // WHERE id > 12
-     * </code>
-     *
-     * @param     mixed $id The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function filterById($id = null, $comparison = null)
-    {
-        if (is_array($id)) {
-            $useMinMax = false;
-            if (isset($id['min'])) {
-                $this->addUsingAlias(OrderProductTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($id['max'])) {
-                $this->addUsingAlias(OrderProductTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(OrderProductTableMap::ID, $id, $comparison);
-    }
-
-    /**
-     * Filter the query on the order_id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByOrderId(1234); // WHERE order_id = 1234
-     * $query->filterByOrderId(array(12, 34)); // WHERE order_id IN (12, 34)
-     * $query->filterByOrderId(array('min' => 12)); // WHERE order_id > 12
-     * </code>
-     *
-     * @see       filterByOrder()
-     *
-     * @param     mixed $orderId The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function filterByOrderId($orderId = null, $comparison = null)
-    {
-        if (is_array($orderId)) {
-            $useMinMax = false;
-            if (isset($orderId['min'])) {
-                $this->addUsingAlias(OrderProductTableMap::ORDER_ID, $orderId['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($orderId['max'])) {
-                $this->addUsingAlias(OrderProductTableMap::ORDER_ID, $orderId['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(OrderProductTableMap::ORDER_ID, $orderId, $comparison);
-    }
-
-    /**
-     * Filter the query on the product_ref column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByProductRef('fooValue');   // WHERE product_ref = 'fooValue'
-     * $query->filterByProductRef('%fooValue%'); // WHERE product_ref LIKE '%fooValue%'
-     * </code>
-     *
-     * @param     string $productRef The value to use as filter.
-     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function filterByProductRef($productRef = null, $comparison = null)
-    {
-        if (null === $comparison) {
-            if (is_array($productRef)) {
-                $comparison = Criteria::IN;
-            } elseif (preg_match('/[\%\*]/', $productRef)) {
-                $productRef = str_replace('*', '%', $productRef);
-                $comparison = Criteria::LIKE;
-            }
-        }
-
-        return $this->addUsingAlias(OrderProductTableMap::PRODUCT_REF, $productRef, $comparison);
-    }
-
-    /**
-     * Filter the query on the title column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByTitle('fooValue');   // WHERE title = 'fooValue'
-     * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%'
-     * </code>
-     *
-     * @param     string $title The value to use as filter.
-     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function filterByTitle($title = null, $comparison = null)
-    {
-        if (null === $comparison) {
-            if (is_array($title)) {
-                $comparison = Criteria::IN;
-            } elseif (preg_match('/[\%\*]/', $title)) {
-                $title = str_replace('*', '%', $title);
-                $comparison = Criteria::LIKE;
-            }
-        }
-
-        return $this->addUsingAlias(OrderProductTableMap::TITLE, $title, $comparison);
-    }
-
-    /**
-     * Filter the query on the description column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByDescription('fooValue');   // WHERE description = 'fooValue'
-     * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%'
-     * </code>
-     *
-     * @param     string $description The value to use as filter.
-     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function filterByDescription($description = null, $comparison = null)
-    {
-        if (null === $comparison) {
-            if (is_array($description)) {
-                $comparison = Criteria::IN;
-            } elseif (preg_match('/[\%\*]/', $description)) {
-                $description = str_replace('*', '%', $description);
-                $comparison = Criteria::LIKE;
-            }
-        }
-
-        return $this->addUsingAlias(OrderProductTableMap::DESCRIPTION, $description, $comparison);
-    }
-
-    /**
-     * Filter the query on the chapo column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByChapo('fooValue');   // WHERE chapo = 'fooValue'
-     * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%'
-     * </code>
-     *
-     * @param     string $chapo The value to use as filter.
-     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function filterByChapo($chapo = null, $comparison = null)
-    {
-        if (null === $comparison) {
-            if (is_array($chapo)) {
-                $comparison = Criteria::IN;
-            } elseif (preg_match('/[\%\*]/', $chapo)) {
-                $chapo = str_replace('*', '%', $chapo);
-                $comparison = Criteria::LIKE;
-            }
-        }
-
-        return $this->addUsingAlias(OrderProductTableMap::CHAPO, $chapo, $comparison);
-    }
-
-    /**
-     * Filter the query on the quantity column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByQuantity(1234); // WHERE quantity = 1234
-     * $query->filterByQuantity(array(12, 34)); // WHERE quantity IN (12, 34)
-     * $query->filterByQuantity(array('min' => 12)); // WHERE quantity > 12
-     * </code>
-     *
-     * @param     mixed $quantity The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function filterByQuantity($quantity = null, $comparison = null)
-    {
-        if (is_array($quantity)) {
-            $useMinMax = false;
-            if (isset($quantity['min'])) {
-                $this->addUsingAlias(OrderProductTableMap::QUANTITY, $quantity['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($quantity['max'])) {
-                $this->addUsingAlias(OrderProductTableMap::QUANTITY, $quantity['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(OrderProductTableMap::QUANTITY, $quantity, $comparison);
-    }
-
-    /**
-     * Filter the query on the price column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByPrice(1234); // WHERE price = 1234
-     * $query->filterByPrice(array(12, 34)); // WHERE price IN (12, 34)
-     * $query->filterByPrice(array('min' => 12)); // WHERE price > 12
-     * </code>
-     *
-     * @param     mixed $price The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function filterByPrice($price = null, $comparison = null)
-    {
-        if (is_array($price)) {
-            $useMinMax = false;
-            if (isset($price['min'])) {
-                $this->addUsingAlias(OrderProductTableMap::PRICE, $price['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($price['max'])) {
-                $this->addUsingAlias(OrderProductTableMap::PRICE, $price['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(OrderProductTableMap::PRICE, $price, $comparison);
-    }
-
-    /**
-     * Filter the query on the tax column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByTax(1234); // WHERE tax = 1234
-     * $query->filterByTax(array(12, 34)); // WHERE tax IN (12, 34)
-     * $query->filterByTax(array('min' => 12)); // WHERE tax > 12
-     * </code>
-     *
-     * @param     mixed $tax The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function filterByTax($tax = null, $comparison = null)
-    {
-        if (is_array($tax)) {
-            $useMinMax = false;
-            if (isset($tax['min'])) {
-                $this->addUsingAlias(OrderProductTableMap::TAX, $tax['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($tax['max'])) {
-                $this->addUsingAlias(OrderProductTableMap::TAX, $tax['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(OrderProductTableMap::TAX, $tax, $comparison);
-    }
-
-    /**
-     * Filter the query on the parent column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByParent(1234); // WHERE parent = 1234
-     * $query->filterByParent(array(12, 34)); // WHERE parent IN (12, 34)
-     * $query->filterByParent(array('min' => 12)); // WHERE parent > 12
-     * </code>
-     *
-     * @param     mixed $parent The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function filterByParent($parent = null, $comparison = null)
-    {
-        if (is_array($parent)) {
-            $useMinMax = false;
-            if (isset($parent['min'])) {
-                $this->addUsingAlias(OrderProductTableMap::PARENT, $parent['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($parent['max'])) {
-                $this->addUsingAlias(OrderProductTableMap::PARENT, $parent['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(OrderProductTableMap::PARENT, $parent, $comparison);
-    }
-
-    /**
-     * Filter the query on the created_at column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14'
-     * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14'
-     * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
-     * </code>
-     *
-     * @param     mixed $createdAt The value to use as filter.
-     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *              Empty strings are treated as NULL.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function filterByCreatedAt($createdAt = null, $comparison = null)
-    {
-        if (is_array($createdAt)) {
-            $useMinMax = false;
-            if (isset($createdAt['min'])) {
-                $this->addUsingAlias(OrderProductTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($createdAt['max'])) {
-                $this->addUsingAlias(OrderProductTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(OrderProductTableMap::CREATED_AT, $createdAt, $comparison);
-    }
-
-    /**
-     * Filter the query on the updated_at column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14'
-     * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14'
-     * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
-     * </code>
-     *
-     * @param     mixed $updatedAt The value to use as filter.
-     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *              Empty strings are treated as NULL.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function filterByUpdatedAt($updatedAt = null, $comparison = null)
-    {
-        if (is_array($updatedAt)) {
-            $useMinMax = false;
-            if (isset($updatedAt['min'])) {
-                $this->addUsingAlias(OrderProductTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($updatedAt['max'])) {
-                $this->addUsingAlias(OrderProductTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(OrderProductTableMap::UPDATED_AT, $updatedAt, $comparison);
-    }
-
-    /**
-     * Filter the query by a related \Thelia\Model\Order object
-     *
-     * @param \Thelia\Model\Order|ObjectCollection $order The related object(s) to use as filter
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function filterByOrder($order, $comparison = null)
-    {
-        if ($order instanceof \Thelia\Model\Order) {
-            return $this
-                ->addUsingAlias(OrderProductTableMap::ORDER_ID, $order->getId(), $comparison);
-        } elseif ($order instanceof ObjectCollection) {
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-
-            return $this
-                ->addUsingAlias(OrderProductTableMap::ORDER_ID, $order->toKeyValue('PrimaryKey', 'Id'), $comparison);
-        } else {
-            throw new PropelException('filterByOrder() only accepts arguments of type \Thelia\Model\Order or Collection');
-        }
-    }
-
-    /**
-     * Adds a JOIN clause to the query using the Order relation
-     *
-     * @param     string $relationAlias optional alias for the relation
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function joinOrder($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('Order');
-
-        // create a ModelJoin object for this join
-        $join = new ModelJoin();
-        $join->setJoinType($joinType);
-        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
-        if ($previousJoin = $this->getPreviousJoin()) {
-            $join->setPreviousJoin($previousJoin);
-        }
-
-        // add the ModelJoin to the current object
-        if ($relationAlias) {
-            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
-            $this->addJoinObject($join, $relationAlias);
-        } else {
-            $this->addJoinObject($join, 'Order');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Use the Order relation Order object
-     *
-     * @see useQuery()
-     *
-     * @param     string $relationAlias optional alias for the relation,
-     *                                   to be used as main alias in the secondary query
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return   \Thelia\Model\OrderQuery A secondary query class using the current class as primary query
-     */
-    public function useOrderQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        return $this
-            ->joinOrder($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'Order', '\Thelia\Model\OrderQuery');
-    }
-
-    /**
-     * Filter the query by a related \Thelia\Model\OrderFeature object
-     *
-     * @param \Thelia\Model\OrderFeature|ObjectCollection $orderFeature  the related object to use as filter
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function filterByOrderFeature($orderFeature, $comparison = null)
-    {
-        if ($orderFeature instanceof \Thelia\Model\OrderFeature) {
-            return $this
-                ->addUsingAlias(OrderProductTableMap::ID, $orderFeature->getOrderProductId(), $comparison);
-        } elseif ($orderFeature instanceof ObjectCollection) {
-            return $this
-                ->useOrderFeatureQuery()
-                ->filterByPrimaryKeys($orderFeature->getPrimaryKeys())
-                ->endUse();
-        } else {
-            throw new PropelException('filterByOrderFeature() only accepts arguments of type \Thelia\Model\OrderFeature or Collection');
-        }
-    }
-
-    /**
-     * Adds a JOIN clause to the query using the OrderFeature relation
-     *
-     * @param     string $relationAlias optional alias for the relation
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function joinOrderFeature($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('OrderFeature');
-
-        // create a ModelJoin object for this join
-        $join = new ModelJoin();
-        $join->setJoinType($joinType);
-        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
-        if ($previousJoin = $this->getPreviousJoin()) {
-            $join->setPreviousJoin($previousJoin);
-        }
-
-        // add the ModelJoin to the current object
-        if ($relationAlias) {
-            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
-            $this->addJoinObject($join, $relationAlias);
-        } else {
-            $this->addJoinObject($join, 'OrderFeature');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Use the OrderFeature relation OrderFeature object
-     *
-     * @see useQuery()
-     *
-     * @param     string $relationAlias optional alias for the relation,
-     *                                   to be used as main alias in the secondary query
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return   \Thelia\Model\OrderFeatureQuery A secondary query class using the current class as primary query
-     */
-    public function useOrderFeatureQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        return $this
-            ->joinOrderFeature($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'OrderFeature', '\Thelia\Model\OrderFeatureQuery');
-    }
-
-    /**
-     * Exclude object from result
-     *
-     * @param   ChildOrderProduct $orderProduct Object to remove from the list of results
-     *
-     * @return ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function prune($orderProduct = null)
-    {
-        if ($orderProduct) {
-            $this->addUsingAlias(OrderProductTableMap::ID, $orderProduct->getId(), Criteria::NOT_EQUAL);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Deletes all rows from the order_product table.
-     *
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).
-     */
-    public function doDeleteAll(ConnectionInterface $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductTableMap::DATABASE_NAME);
-        }
-        $affectedRows = 0; // initialize var to track total num of affected rows
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table or we could emulating ON DELETE CASCADE, etc.
-            $con->beginTransaction();
-            $affectedRows += parent::doDeleteAll($con);
-            // Because this db requires some delete cascade/set null emulation, we have to
-            // clear the cached instance *after* the emulation has happened (since
-            // instances get re-added by the select statement contained therein).
-            OrderProductTableMap::clearInstancePool();
-            OrderProductTableMap::clearRelatedInstancePool();
-
-            $con->commit();
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-
-        return $affectedRows;
-    }
-
-    /**
-     * Performs a DELETE on the database, given a ChildOrderProduct or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or ChildOrderProduct object or primary key or array of primary keys
-     *              which is used to create the DELETE statement
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-     public function delete(ConnectionInterface $con = null)
-     {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductTableMap::DATABASE_NAME);
-        }
-
-        $criteria = $this;
-
-        // Set the correct dbName
-        $criteria->setDbName(OrderProductTableMap::DATABASE_NAME);
-
-        $affectedRows = 0; // initialize var to track total num of affected rows
-
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table or we could emulating ON DELETE CASCADE, etc.
-            $con->beginTransaction();
-
-
-        OrderProductTableMap::removeInstanceFromPool($criteria);
-
-            $affectedRows += ModelCriteria::delete($con);
-            OrderProductTableMap::clearRelatedInstancePool();
-            $con->commit();
-
-            return $affectedRows;
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-    }
-
-    // timestampable behavior
-
-    /**
-     * Filter by the latest updated
-     *
-     * @param      int $nbDays Maximum age of the latest update in days
-     *
-     * @return     ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function recentlyUpdated($nbDays = 7)
-    {
-        return $this->addUsingAlias(OrderProductTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
-    }
-
-    /**
-     * Filter by the latest created
-     *
-     * @param      int $nbDays Maximum age of in days
-     *
-     * @return     ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function recentlyCreated($nbDays = 7)
-    {
-        return $this->addUsingAlias(OrderProductTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
-    }
-
-    /**
-     * Order by update date desc
-     *
-     * @return     ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function lastUpdatedFirst()
-    {
-        return $this->addDescendingOrderByColumn(OrderProductTableMap::UPDATED_AT);
-    }
-
-    /**
-     * Order by update date asc
-     *
-     * @return     ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function firstUpdatedFirst()
-    {
-        return $this->addAscendingOrderByColumn(OrderProductTableMap::UPDATED_AT);
-    }
-
-    /**
-     * Order by create date desc
-     *
-     * @return     ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function lastCreatedFirst()
-    {
-        return $this->addDescendingOrderByColumn(OrderProductTableMap::CREATED_AT);
-    }
-
-    /**
-     * Order by create date asc
-     *
-     * @return     ChildOrderProductQuery The current query, for fluid interface
-     */
-    public function firstCreatedFirst()
-    {
-        return $this->addAscendingOrderByColumn(OrderProductTableMap::CREATED_AT);
-    }
-
-} // OrderProductQuery
diff --git a/core/lib/Thelia/Model/Map/OrderProductTableMap.php b/core/lib/Thelia/Model/Map/OrderAttributeCombinationTableMap.php
similarity index 51%
rename from core/lib/Thelia/Model/Map/OrderProductTableMap.php
rename to core/lib/Thelia/Model/Map/OrderAttributeCombinationTableMap.php
index 038d12863..f87e8d59e 100644
--- a/core/lib/Thelia/Model/Map/OrderProductTableMap.php
+++ b/core/lib/Thelia/Model/Map/OrderAttributeCombinationTableMap.php
@@ -10,12 +10,12 @@ use Propel\Runtime\Exception\PropelException;
 use Propel\Runtime\Map\RelationMap;
 use Propel\Runtime\Map\TableMap;
 use Propel\Runtime\Map\TableMapTrait;
-use Thelia\Model\OrderProduct;
-use Thelia\Model\OrderProductQuery;
+use Thelia\Model\OrderAttributeCombination;
+use Thelia\Model\OrderAttributeCombinationQuery;
 
 
 /**
- * This class defines the structure of the 'order_product' table.
+ * This class defines the structure of the 'order_attribute_combination' table.
  *
  *
  *
@@ -25,14 +25,14 @@ use Thelia\Model\OrderProductQuery;
  * (i.e. if it's a text column type).
  *
  */
-class OrderProductTableMap extends TableMap
+class OrderAttributeCombinationTableMap extends TableMap
 {
     use InstancePoolTrait;
     use TableMapTrait;
     /**
      * The (dot-path) name of this class
      */
-    const CLASS_NAME = 'Thelia.Model.Map.OrderProductTableMap';
+    const CLASS_NAME = 'Thelia.Model.Map.OrderAttributeCombinationTableMap';
 
     /**
      * The default database name for this class
@@ -42,17 +42,17 @@ class OrderProductTableMap extends TableMap
     /**
      * The table name for this class
      */
-    const TABLE_NAME = 'order_product';
+    const TABLE_NAME = 'order_attribute_combination';
 
     /**
      * The related Propel class for this table
      */
-    const OM_CLASS = '\\Thelia\\Model\\OrderProduct';
+    const OM_CLASS = '\\Thelia\\Model\\OrderAttributeCombination';
 
     /**
      * A class that can be returned by this tableMap
      */
-    const CLASS_DEFAULT = 'Thelia.Model.OrderProduct';
+    const CLASS_DEFAULT = 'Thelia.Model.OrderAttributeCombination';
 
     /**
      * The total number of columns
@@ -72,62 +72,62 @@ class OrderProductTableMap extends TableMap
     /**
      * the column name for the ID field
      */
-    const ID = 'order_product.ID';
+    const ID = 'order_attribute_combination.ID';
 
     /**
-     * the column name for the ORDER_ID field
+     * the column name for the ORDER_PRODUCT_ID field
      */
-    const ORDER_ID = 'order_product.ORDER_ID';
+    const ORDER_PRODUCT_ID = 'order_attribute_combination.ORDER_PRODUCT_ID';
 
     /**
-     * the column name for the PRODUCT_REF field
+     * the column name for the ATTRIBUTE_TITLE field
      */
-    const PRODUCT_REF = 'order_product.PRODUCT_REF';
+    const ATTRIBUTE_TITLE = 'order_attribute_combination.ATTRIBUTE_TITLE';
 
     /**
-     * the column name for the TITLE field
+     * the column name for the ATTRIBUTE_CHAPO field
      */
-    const TITLE = 'order_product.TITLE';
+    const ATTRIBUTE_CHAPO = 'order_attribute_combination.ATTRIBUTE_CHAPO';
 
     /**
-     * the column name for the DESCRIPTION field
+     * the column name for the ATTRIBUTE_DESCRIPTION field
      */
-    const DESCRIPTION = 'order_product.DESCRIPTION';
+    const ATTRIBUTE_DESCRIPTION = 'order_attribute_combination.ATTRIBUTE_DESCRIPTION';
 
     /**
-     * the column name for the CHAPO field
+     * the column name for the ATTRIBUTE_POSTSCRIPTUMN field
      */
-    const CHAPO = 'order_product.CHAPO';
+    const ATTRIBUTE_POSTSCRIPTUMN = 'order_attribute_combination.ATTRIBUTE_POSTSCRIPTUMN';
 
     /**
-     * the column name for the QUANTITY field
+     * the column name for the ATTRIBUTE_AV_TITLE field
      */
-    const QUANTITY = 'order_product.QUANTITY';
+    const ATTRIBUTE_AV_TITLE = 'order_attribute_combination.ATTRIBUTE_AV_TITLE';
 
     /**
-     * the column name for the PRICE field
+     * the column name for the ATTRIBUTE_AV_CHAPO field
      */
-    const PRICE = 'order_product.PRICE';
+    const ATTRIBUTE_AV_CHAPO = 'order_attribute_combination.ATTRIBUTE_AV_CHAPO';
 
     /**
-     * the column name for the TAX field
+     * the column name for the ATTRIBUTE_AV_DESCRIPTION field
      */
-    const TAX = 'order_product.TAX';
+    const ATTRIBUTE_AV_DESCRIPTION = 'order_attribute_combination.ATTRIBUTE_AV_DESCRIPTION';
 
     /**
-     * the column name for the PARENT field
+     * the column name for the ATTRIBUTE_AV_POSTSCRIPTUM field
      */
-    const PARENT = 'order_product.PARENT';
+    const ATTRIBUTE_AV_POSTSCRIPTUM = 'order_attribute_combination.ATTRIBUTE_AV_POSTSCRIPTUM';
 
     /**
      * the column name for the CREATED_AT field
      */
-    const CREATED_AT = 'order_product.CREATED_AT';
+    const CREATED_AT = 'order_attribute_combination.CREATED_AT';
 
     /**
      * the column name for the UPDATED_AT field
      */
-    const UPDATED_AT = 'order_product.UPDATED_AT';
+    const UPDATED_AT = 'order_attribute_combination.UPDATED_AT';
 
     /**
      * The default string format for model objects of the related table
@@ -141,11 +141,11 @@ class OrderProductTableMap extends TableMap
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'OrderId', 'ProductRef', 'Title', 'Description', 'Chapo', 'Quantity', 'Price', 'Tax', 'Parent', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'orderId', 'productRef', 'title', 'description', 'chapo', 'quantity', 'price', 'tax', 'parent', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(OrderProductTableMap::ID, OrderProductTableMap::ORDER_ID, OrderProductTableMap::PRODUCT_REF, OrderProductTableMap::TITLE, OrderProductTableMap::DESCRIPTION, OrderProductTableMap::CHAPO, OrderProductTableMap::QUANTITY, OrderProductTableMap::PRICE, OrderProductTableMap::TAX, OrderProductTableMap::PARENT, OrderProductTableMap::CREATED_AT, OrderProductTableMap::UPDATED_AT, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'ORDER_ID', 'PRODUCT_REF', 'TITLE', 'DESCRIPTION', 'CHAPO', 'QUANTITY', 'PRICE', 'TAX', 'PARENT', 'CREATED_AT', 'UPDATED_AT', ),
-        self::TYPE_FIELDNAME     => array('id', 'order_id', 'product_ref', 'title', 'description', 'chapo', 'quantity', 'price', 'tax', 'parent', 'created_at', 'updated_at', ),
+        self::TYPE_PHPNAME       => array('Id', 'OrderProductId', 'AttributeTitle', 'AttributeChapo', 'AttributeDescription', 'AttributePostscriptumn', 'AttributeAvTitle', 'AttributeAvChapo', 'AttributeAvDescription', 'AttributeAvPostscriptum', 'CreatedAt', 'UpdatedAt', ),
+        self::TYPE_STUDLYPHPNAME => array('id', 'orderProductId', 'attributeTitle', 'attributeChapo', 'attributeDescription', 'attributePostscriptumn', 'attributeAvTitle', 'attributeAvChapo', 'attributeAvDescription', 'attributeAvPostscriptum', 'createdAt', 'updatedAt', ),
+        self::TYPE_COLNAME       => array(OrderAttributeCombinationTableMap::ID, OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE, OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO, OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION, OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM, OrderAttributeCombinationTableMap::CREATED_AT, OrderAttributeCombinationTableMap::UPDATED_AT, ),
+        self::TYPE_RAW_COLNAME   => array('ID', 'ORDER_PRODUCT_ID', 'ATTRIBUTE_TITLE', 'ATTRIBUTE_CHAPO', 'ATTRIBUTE_DESCRIPTION', 'ATTRIBUTE_POSTSCRIPTUMN', 'ATTRIBUTE_AV_TITLE', 'ATTRIBUTE_AV_CHAPO', 'ATTRIBUTE_AV_DESCRIPTION', 'ATTRIBUTE_AV_POSTSCRIPTUM', 'CREATED_AT', 'UPDATED_AT', ),
+        self::TYPE_FIELDNAME     => array('id', 'order_product_id', 'attribute_title', 'attribute_chapo', 'attribute_description', 'attribute_postscriptumn', 'attribute_av_title', 'attribute_av_chapo', 'attribute_av_description', 'attribute_av_postscriptum', 'created_at', 'updated_at', ),
         self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, )
     );
 
@@ -156,11 +156,11 @@ class OrderProductTableMap extends TableMap
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
     protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'OrderId' => 1, 'ProductRef' => 2, 'Title' => 3, 'Description' => 4, 'Chapo' => 5, 'Quantity' => 6, 'Price' => 7, 'Tax' => 8, 'Parent' => 9, 'CreatedAt' => 10, 'UpdatedAt' => 11, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'orderId' => 1, 'productRef' => 2, 'title' => 3, 'description' => 4, 'chapo' => 5, 'quantity' => 6, 'price' => 7, 'tax' => 8, 'parent' => 9, 'createdAt' => 10, 'updatedAt' => 11, ),
-        self::TYPE_COLNAME       => array(OrderProductTableMap::ID => 0, OrderProductTableMap::ORDER_ID => 1, OrderProductTableMap::PRODUCT_REF => 2, OrderProductTableMap::TITLE => 3, OrderProductTableMap::DESCRIPTION => 4, OrderProductTableMap::CHAPO => 5, OrderProductTableMap::QUANTITY => 6, OrderProductTableMap::PRICE => 7, OrderProductTableMap::TAX => 8, OrderProductTableMap::PARENT => 9, OrderProductTableMap::CREATED_AT => 10, OrderProductTableMap::UPDATED_AT => 11, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'ORDER_ID' => 1, 'PRODUCT_REF' => 2, 'TITLE' => 3, 'DESCRIPTION' => 4, 'CHAPO' => 5, 'QUANTITY' => 6, 'PRICE' => 7, 'TAX' => 8, 'PARENT' => 9, 'CREATED_AT' => 10, 'UPDATED_AT' => 11, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'order_id' => 1, 'product_ref' => 2, 'title' => 3, 'description' => 4, 'chapo' => 5, 'quantity' => 6, 'price' => 7, 'tax' => 8, 'parent' => 9, 'created_at' => 10, 'updated_at' => 11, ),
+        self::TYPE_PHPNAME       => array('Id' => 0, 'OrderProductId' => 1, 'AttributeTitle' => 2, 'AttributeChapo' => 3, 'AttributeDescription' => 4, 'AttributePostscriptumn' => 5, 'AttributeAvTitle' => 6, 'AttributeAvChapo' => 7, 'AttributeAvDescription' => 8, 'AttributeAvPostscriptum' => 9, 'CreatedAt' => 10, 'UpdatedAt' => 11, ),
+        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'orderProductId' => 1, 'attributeTitle' => 2, 'attributeChapo' => 3, 'attributeDescription' => 4, 'attributePostscriptumn' => 5, 'attributeAvTitle' => 6, 'attributeAvChapo' => 7, 'attributeAvDescription' => 8, 'attributeAvPostscriptum' => 9, 'createdAt' => 10, 'updatedAt' => 11, ),
+        self::TYPE_COLNAME       => array(OrderAttributeCombinationTableMap::ID => 0, OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID => 1, OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE => 2, OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO => 3, OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION => 4, OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN => 5, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE => 6, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO => 7, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION => 8, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM => 9, OrderAttributeCombinationTableMap::CREATED_AT => 10, OrderAttributeCombinationTableMap::UPDATED_AT => 11, ),
+        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'ORDER_PRODUCT_ID' => 1, 'ATTRIBUTE_TITLE' => 2, 'ATTRIBUTE_CHAPO' => 3, 'ATTRIBUTE_DESCRIPTION' => 4, 'ATTRIBUTE_POSTSCRIPTUMN' => 5, 'ATTRIBUTE_AV_TITLE' => 6, 'ATTRIBUTE_AV_CHAPO' => 7, 'ATTRIBUTE_AV_DESCRIPTION' => 8, 'ATTRIBUTE_AV_POSTSCRIPTUM' => 9, 'CREATED_AT' => 10, 'UPDATED_AT' => 11, ),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'order_product_id' => 1, 'attribute_title' => 2, 'attribute_chapo' => 3, 'attribute_description' => 4, 'attribute_postscriptumn' => 5, 'attribute_av_title' => 6, 'attribute_av_chapo' => 7, 'attribute_av_description' => 8, 'attribute_av_postscriptum' => 9, 'created_at' => 10, 'updated_at' => 11, ),
         self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, )
     );
 
@@ -174,22 +174,22 @@ class OrderProductTableMap extends TableMap
     public function initialize()
     {
         // attributes
-        $this->setName('order_product');
-        $this->setPhpName('OrderProduct');
-        $this->setClassName('\\Thelia\\Model\\OrderProduct');
+        $this->setName('order_attribute_combination');
+        $this->setPhpName('OrderAttributeCombination');
+        $this->setClassName('\\Thelia\\Model\\OrderAttributeCombination');
         $this->setPackage('Thelia.Model');
         $this->setUseIdGenerator(true);
         // columns
         $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
-        $this->addForeignKey('ORDER_ID', 'OrderId', 'INTEGER', 'order', 'ID', true, null, null);
-        $this->addColumn('PRODUCT_REF', 'ProductRef', 'VARCHAR', false, 255, null);
-        $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
-        $this->addColumn('DESCRIPTION', 'Description', 'LONGVARCHAR', false, null, null);
-        $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
-        $this->addColumn('QUANTITY', 'Quantity', 'FLOAT', true, null, null);
-        $this->addColumn('PRICE', 'Price', 'FLOAT', true, null, null);
-        $this->addColumn('TAX', 'Tax', 'FLOAT', false, null, null);
-        $this->addColumn('PARENT', 'Parent', 'INTEGER', false, null, null);
+        $this->addForeignKey('ORDER_PRODUCT_ID', 'OrderProductId', 'INTEGER', 'order_product', 'ID', true, null, null);
+        $this->addColumn('ATTRIBUTE_TITLE', 'AttributeTitle', 'VARCHAR', true, 255, null);
+        $this->addColumn('ATTRIBUTE_CHAPO', 'AttributeChapo', 'LONGVARCHAR', false, null, null);
+        $this->addColumn('ATTRIBUTE_DESCRIPTION', 'AttributeDescription', 'CLOB', false, null, null);
+        $this->addColumn('ATTRIBUTE_POSTSCRIPTUMN', 'AttributePostscriptumn', 'LONGVARCHAR', false, null, null);
+        $this->addColumn('ATTRIBUTE_AV_TITLE', 'AttributeAvTitle', 'VARCHAR', true, 255, null);
+        $this->addColumn('ATTRIBUTE_AV_CHAPO', 'AttributeAvChapo', 'LONGVARCHAR', false, null, null);
+        $this->addColumn('ATTRIBUTE_AV_DESCRIPTION', 'AttributeAvDescription', 'CLOB', false, null, null);
+        $this->addColumn('ATTRIBUTE_AV_POSTSCRIPTUM', 'AttributeAvPostscriptum', 'LONGVARCHAR', false, null, null);
         $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
         $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
     } // initialize()
@@ -199,8 +199,7 @@ class OrderProductTableMap extends TableMap
      */
     public function buildRelations()
     {
-        $this->addRelation('Order', '\\Thelia\\Model\\Order', RelationMap::MANY_TO_ONE, array('order_id' => 'id', ), 'CASCADE', 'RESTRICT');
-        $this->addRelation('OrderFeature', '\\Thelia\\Model\\OrderFeature', RelationMap::ONE_TO_MANY, array('id' => 'order_product_id', ), 'CASCADE', 'RESTRICT', 'OrderFeatures');
+        $this->addRelation('OrderProduct', '\\Thelia\\Model\\OrderProduct', RelationMap::MANY_TO_ONE, array('order_product_id' => 'id', ), 'CASCADE', 'RESTRICT');
     } // buildRelations()
 
     /**
@@ -215,15 +214,6 @@ class OrderProductTableMap extends TableMap
             'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
         );
     } // getBehaviors()
-    /**
-     * Method to invalidate the instance pool of all tables related to order_product     * by a foreign key with ON DELETE CASCADE
-     */
-    public static function clearRelatedInstancePool()
-    {
-        // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool,
-        // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule.
-                OrderFeatureTableMap::clearInstancePool();
-            }
 
     /**
      * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
@@ -281,7 +271,7 @@ class OrderProductTableMap extends TableMap
      */
     public static function getOMClass($withPrefix = true)
     {
-        return $withPrefix ? OrderProductTableMap::CLASS_DEFAULT : OrderProductTableMap::OM_CLASS;
+        return $withPrefix ? OrderAttributeCombinationTableMap::CLASS_DEFAULT : OrderAttributeCombinationTableMap::OM_CLASS;
     }
 
     /**
@@ -295,21 +285,21 @@ class OrderProductTableMap extends TableMap
      *
      * @throws PropelException Any exceptions caught during processing will be
      *         rethrown wrapped into a PropelException.
-     * @return array (OrderProduct object, last column rank)
+     * @return array (OrderAttributeCombination object, last column rank)
      */
     public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
     {
-        $key = OrderProductTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
-        if (null !== ($obj = OrderProductTableMap::getInstanceFromPool($key))) {
+        $key = OrderAttributeCombinationTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
+        if (null !== ($obj = OrderAttributeCombinationTableMap::getInstanceFromPool($key))) {
             // We no longer rehydrate the object, since this can cause data loss.
             // See http://www.propelorm.org/ticket/509
             // $obj->hydrate($row, $offset, true); // rehydrate
-            $col = $offset + OrderProductTableMap::NUM_HYDRATE_COLUMNS;
+            $col = $offset + OrderAttributeCombinationTableMap::NUM_HYDRATE_COLUMNS;
         } else {
-            $cls = OrderProductTableMap::OM_CLASS;
+            $cls = OrderAttributeCombinationTableMap::OM_CLASS;
             $obj = new $cls();
             $col = $obj->hydrate($row, $offset, false, $indexType);
-            OrderProductTableMap::addInstanceToPool($obj, $key);
+            OrderAttributeCombinationTableMap::addInstanceToPool($obj, $key);
         }
 
         return array($obj, $col);
@@ -332,8 +322,8 @@ class OrderProductTableMap extends TableMap
         $cls = static::getOMClass(false);
         // populate the object(s)
         while ($row = $dataFetcher->fetch()) {
-            $key = OrderProductTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
-            if (null !== ($obj = OrderProductTableMap::getInstanceFromPool($key))) {
+            $key = OrderAttributeCombinationTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
+            if (null !== ($obj = OrderAttributeCombinationTableMap::getInstanceFromPool($key))) {
                 // We no longer rehydrate the object, since this can cause data loss.
                 // See http://www.propelorm.org/ticket/509
                 // $obj->hydrate($row, 0, true); // rehydrate
@@ -342,7 +332,7 @@ class OrderProductTableMap extends TableMap
                 $obj = new $cls();
                 $obj->hydrate($row);
                 $results[] = $obj;
-                OrderProductTableMap::addInstanceToPool($obj, $key);
+                OrderAttributeCombinationTableMap::addInstanceToPool($obj, $key);
             } // if key exists
         }
 
@@ -363,29 +353,29 @@ class OrderProductTableMap extends TableMap
     public static function addSelectColumns(Criteria $criteria, $alias = null)
     {
         if (null === $alias) {
-            $criteria->addSelectColumn(OrderProductTableMap::ID);
-            $criteria->addSelectColumn(OrderProductTableMap::ORDER_ID);
-            $criteria->addSelectColumn(OrderProductTableMap::PRODUCT_REF);
-            $criteria->addSelectColumn(OrderProductTableMap::TITLE);
-            $criteria->addSelectColumn(OrderProductTableMap::DESCRIPTION);
-            $criteria->addSelectColumn(OrderProductTableMap::CHAPO);
-            $criteria->addSelectColumn(OrderProductTableMap::QUANTITY);
-            $criteria->addSelectColumn(OrderProductTableMap::PRICE);
-            $criteria->addSelectColumn(OrderProductTableMap::TAX);
-            $criteria->addSelectColumn(OrderProductTableMap::PARENT);
-            $criteria->addSelectColumn(OrderProductTableMap::CREATED_AT);
-            $criteria->addSelectColumn(OrderProductTableMap::UPDATED_AT);
+            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ID);
+            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID);
+            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE);
+            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO);
+            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION);
+            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN);
+            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE);
+            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO);
+            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION);
+            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM);
+            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::CREATED_AT);
+            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::UPDATED_AT);
         } else {
             $criteria->addSelectColumn($alias . '.ID');
-            $criteria->addSelectColumn($alias . '.ORDER_ID');
-            $criteria->addSelectColumn($alias . '.PRODUCT_REF');
-            $criteria->addSelectColumn($alias . '.TITLE');
-            $criteria->addSelectColumn($alias . '.DESCRIPTION');
-            $criteria->addSelectColumn($alias . '.CHAPO');
-            $criteria->addSelectColumn($alias . '.QUANTITY');
-            $criteria->addSelectColumn($alias . '.PRICE');
-            $criteria->addSelectColumn($alias . '.TAX');
-            $criteria->addSelectColumn($alias . '.PARENT');
+            $criteria->addSelectColumn($alias . '.ORDER_PRODUCT_ID');
+            $criteria->addSelectColumn($alias . '.ATTRIBUTE_TITLE');
+            $criteria->addSelectColumn($alias . '.ATTRIBUTE_CHAPO');
+            $criteria->addSelectColumn($alias . '.ATTRIBUTE_DESCRIPTION');
+            $criteria->addSelectColumn($alias . '.ATTRIBUTE_POSTSCRIPTUMN');
+            $criteria->addSelectColumn($alias . '.ATTRIBUTE_AV_TITLE');
+            $criteria->addSelectColumn($alias . '.ATTRIBUTE_AV_CHAPO');
+            $criteria->addSelectColumn($alias . '.ATTRIBUTE_AV_DESCRIPTION');
+            $criteria->addSelectColumn($alias . '.ATTRIBUTE_AV_POSTSCRIPTUM');
             $criteria->addSelectColumn($alias . '.CREATED_AT');
             $criteria->addSelectColumn($alias . '.UPDATED_AT');
         }
@@ -400,7 +390,7 @@ class OrderProductTableMap extends TableMap
      */
     public static function getTableMap()
     {
-        return Propel::getServiceContainer()->getDatabaseMap(OrderProductTableMap::DATABASE_NAME)->getTable(OrderProductTableMap::TABLE_NAME);
+        return Propel::getServiceContainer()->getDatabaseMap(OrderAttributeCombinationTableMap::DATABASE_NAME)->getTable(OrderAttributeCombinationTableMap::TABLE_NAME);
     }
 
     /**
@@ -408,16 +398,16 @@ class OrderProductTableMap extends TableMap
      */
     public static function buildTableMap()
     {
-      $dbMap = Propel::getServiceContainer()->getDatabaseMap(OrderProductTableMap::DATABASE_NAME);
-      if (!$dbMap->hasTable(OrderProductTableMap::TABLE_NAME)) {
-        $dbMap->addTableObject(new OrderProductTableMap());
+      $dbMap = Propel::getServiceContainer()->getDatabaseMap(OrderAttributeCombinationTableMap::DATABASE_NAME);
+      if (!$dbMap->hasTable(OrderAttributeCombinationTableMap::TABLE_NAME)) {
+        $dbMap->addTableObject(new OrderAttributeCombinationTableMap());
       }
     }
 
     /**
-     * Performs a DELETE on the database, given a OrderProduct or Criteria object OR a primary key value.
+     * Performs a DELETE on the database, given a OrderAttributeCombination or Criteria object OR a primary key value.
      *
-     * @param mixed               $values Criteria or OrderProduct object or primary key or array of primary keys
+     * @param mixed               $values Criteria or OrderAttributeCombination object or primary key or array of primary keys
      *              which is used to create the DELETE statement
      * @param ConnectionInterface $con the connection to use
      * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
@@ -428,25 +418,25 @@ class OrderProductTableMap extends TableMap
      public static function doDelete($values, ConnectionInterface $con = null)
      {
         if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductTableMap::DATABASE_NAME);
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderAttributeCombinationTableMap::DATABASE_NAME);
         }
 
         if ($values instanceof Criteria) {
             // rename for clarity
             $criteria = $values;
-        } elseif ($values instanceof \Thelia\Model\OrderProduct) { // it's a model object
+        } elseif ($values instanceof \Thelia\Model\OrderAttributeCombination) { // it's a model object
             // create criteria based on pk values
             $criteria = $values->buildPkeyCriteria();
         } else { // it's a primary key, or an array of pks
-            $criteria = new Criteria(OrderProductTableMap::DATABASE_NAME);
-            $criteria->add(OrderProductTableMap::ID, (array) $values, Criteria::IN);
+            $criteria = new Criteria(OrderAttributeCombinationTableMap::DATABASE_NAME);
+            $criteria->add(OrderAttributeCombinationTableMap::ID, (array) $values, Criteria::IN);
         }
 
-        $query = OrderProductQuery::create()->mergeWith($criteria);
+        $query = OrderAttributeCombinationQuery::create()->mergeWith($criteria);
 
-        if ($values instanceof Criteria) { OrderProductTableMap::clearInstancePool();
+        if ($values instanceof Criteria) { OrderAttributeCombinationTableMap::clearInstancePool();
         } elseif (!is_object($values)) { // it's a primary key, or an array of pks
-            foreach ((array) $values as $singleval) { OrderProductTableMap::removeInstanceFromPool($singleval);
+            foreach ((array) $values as $singleval) { OrderAttributeCombinationTableMap::removeInstanceFromPool($singleval);
             }
         }
 
@@ -454,20 +444,20 @@ class OrderProductTableMap extends TableMap
     }
 
     /**
-     * Deletes all rows from the order_product table.
+     * Deletes all rows from the order_attribute_combination table.
      *
      * @param ConnectionInterface $con the connection to use
      * @return int The number of affected rows (if supported by underlying database driver).
      */
     public static function doDeleteAll(ConnectionInterface $con = null)
     {
-        return OrderProductQuery::create()->doDeleteAll($con);
+        return OrderAttributeCombinationQuery::create()->doDeleteAll($con);
     }
 
     /**
-     * Performs an INSERT on the database, given a OrderProduct or Criteria object.
+     * Performs an INSERT on the database, given a OrderAttributeCombination or Criteria object.
      *
-     * @param mixed               $criteria Criteria or OrderProduct object containing data that is used to create the INSERT statement.
+     * @param mixed               $criteria Criteria or OrderAttributeCombination object containing data that is used to create the INSERT statement.
      * @param ConnectionInterface $con the ConnectionInterface connection to use
      * @return mixed           The new primary key.
      * @throws PropelException Any exceptions caught during processing will be
@@ -476,22 +466,22 @@ class OrderProductTableMap extends TableMap
     public static function doInsert($criteria, ConnectionInterface $con = null)
     {
         if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductTableMap::DATABASE_NAME);
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderAttributeCombinationTableMap::DATABASE_NAME);
         }
 
         if ($criteria instanceof Criteria) {
             $criteria = clone $criteria; // rename for clarity
         } else {
-            $criteria = $criteria->buildCriteria(); // build Criteria from OrderProduct object
+            $criteria = $criteria->buildCriteria(); // build Criteria from OrderAttributeCombination object
         }
 
-        if ($criteria->containsKey(OrderProductTableMap::ID) && $criteria->keyContainsValue(OrderProductTableMap::ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.OrderProductTableMap::ID.')');
+        if ($criteria->containsKey(OrderAttributeCombinationTableMap::ID) && $criteria->keyContainsValue(OrderAttributeCombinationTableMap::ID) ) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key ('.OrderAttributeCombinationTableMap::ID.')');
         }
 
 
         // Set the correct dbName
-        $query = OrderProductQuery::create()->mergeWith($criteria);
+        $query = OrderAttributeCombinationQuery::create()->mergeWith($criteria);
 
         try {
             // use transaction because $criteria could contain info
@@ -507,7 +497,7 @@ class OrderProductTableMap extends TableMap
         return $pk;
     }
 
-} // OrderProductTableMap
+} // OrderAttributeCombinationTableMap
 // This is the static code needed to register the TableMap for this table with the main Propel class.
 //
-OrderProductTableMap::buildTableMap();
+OrderAttributeCombinationTableMap::buildTableMap();
diff --git a/core/lib/Thelia/Model/OrderAttributeCombination.php b/core/lib/Thelia/Model/OrderAttributeCombination.php
new file mode 100644
index 000000000..896cda895
--- /dev/null
+++ b/core/lib/Thelia/Model/OrderAttributeCombination.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Thelia\Model;
+
+use Thelia\Model\Base\OrderAttributeCombination as BaseOrderAttributeCombination;
+
+        class OrderAttributeCombination extends BaseOrderAttributeCombination
+{
+
+}
diff --git a/core/lib/Thelia/Model/OrderProductQuery.php b/core/lib/Thelia/Model/OrderAttributeCombinationQuery.php
old mode 100755
new mode 100644
similarity index 55%
rename from core/lib/Thelia/Model/OrderProductQuery.php
rename to core/lib/Thelia/Model/OrderAttributeCombinationQuery.php
index b894e9b49..72d842861
--- a/core/lib/Thelia/Model/OrderProductQuery.php
+++ b/core/lib/Thelia/Model/OrderAttributeCombinationQuery.php
@@ -2,11 +2,11 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base\OrderProductQuery as BaseOrderProductQuery;
+use Thelia\Model\Base\OrderAttributeCombinationQuery as BaseOrderAttributeCombinationQuery;
 
 
 /**
- * Skeleton subclass for performing query and update operations on the 'order_product' table.
+ * Skeleton subclass for performing query and update operations on the 'order_attribute_combination' table.
  *
  *
  *
@@ -15,6 +15,7 @@ use Thelia\Model\Base\OrderProductQuery as BaseOrderProductQuery;
  * long as it does not already exist in the output directory.
  *
  */
-class OrderProductQuery extends BaseOrderProductQuery {
+class OrderAttributeCombinationQuery extends BaseOrderAttributeCombinationQuery
+{
 
-} // OrderProductQuery
+} // OrderAttributeCombinationQuery
diff --git a/core/lib/Thelia/Model/OrderProduct.php b/core/lib/Thelia/Model/OrderProduct.php
deleted file mode 100755
index 2c0e189aa..000000000
--- a/core/lib/Thelia/Model/OrderProduct.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-use Thelia\Model\Base\OrderProduct as BaseOrderProduct;
-
-class OrderProduct extends BaseOrderProduct {
-
-}
diff --git a/install/thelia.sql b/install/thelia.sql
index bd983d26d..372698b7e 100755
--- a/install/thelia.sql
+++ b/install/thelia.sql
@@ -760,14 +760,20 @@ CREATE TABLE `order_product`
 (
     `id` INTEGER NOT NULL AUTO_INCREMENT,
     `order_id` INTEGER NOT NULL,
-    `product_ref` VARCHAR(255),
+    `product_ref` VARCHAR(255) NOT NULL,
+    `product_sale_elements_ref` VARCHAR(255) NOT NULL,
     `title` VARCHAR(255),
-    `description` TEXT,
     `chapo` TEXT,
+    `description` LONGTEXT,
+    `postscriptum` TEXT,
     `quantity` FLOAT NOT NULL,
     `price` FLOAT NOT NULL,
+    `promo_price` VARCHAR(45),
+    `was_new` TINYINT NOT NULL,
+    `was_in_promo` TINYINT NOT NULL,
+    `weight` VARCHAR(45),
     `tax` FLOAT,
-    `parent` INTEGER,
+    `parent` INTEGER COMMENT 'not managed yet',
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
@@ -796,17 +802,23 @@ CREATE TABLE `order_status`
 ) ENGINE=InnoDB;
 
 -- ---------------------------------------------------------------------
--- order_feature
+-- order_attribute_combination
 -- ---------------------------------------------------------------------
 
-DROP TABLE IF EXISTS `order_feature`;
+DROP TABLE IF EXISTS `order_attribute_combination`;
 
-CREATE TABLE `order_feature`
+CREATE TABLE `order_attribute_combination`
 (
     `id` INTEGER NOT NULL AUTO_INCREMENT,
     `order_product_id` INTEGER NOT NULL,
-    `feature_desc` VARCHAR(255),
-    `feature_av_desc` VARCHAR(255),
+    `attribute_title` VARCHAR(255) NOT NULL,
+    `attribute_chapo` TEXT,
+    `attribute_description` LONGTEXT,
+    `attribute_postscriptumn` TEXT,
+    `attribute_av_title` VARCHAR(255) NOT NULL,
+    `attribute_av_chapo` TEXT,
+    `attribute_av_description` LONGTEXT,
+    `attribute_av_postscriptum` TEXT,
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
diff --git a/local/config/schema.xml b/local/config/schema.xml
index b767580ef..fb270534e 100755
--- a/local/config/schema.xml
+++ b/local/config/schema.xml
@@ -595,14 +595,20 @@
   <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="product_ref" required="true" size="255" type="VARCHAR" />
+    <column name="product_sale_elements_ref" required="true" size="255" type="VARCHAR" />
     <column name="title" size="255" type="VARCHAR" />
-    <column name="description" type="LONGVARCHAR" />
     <column name="chapo" type="LONGVARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="postscriptum" type="LONGVARCHAR" />
     <column name="quantity" required="true" type="FLOAT" />
     <column name="price" required="true" type="FLOAT" />
+    <column name="promo_price" size="45" type="VARCHAR" />
+    <column name="was_new" required="true" type="TINYINT" />
+    <column name="was_in_promo" required="true" type="TINYINT" />
+    <column name="weight" size="45" type="VARCHAR" />
     <column name="tax" type="FLOAT" />
-    <column name="parent" type="INTEGER" />
+    <column description="not managed yet" 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>
@@ -626,11 +632,17 @@
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
     </behavior>
   </table>
-  <table name="order_feature" namespace="Thelia\Model">
+  <table name="order_attribute_combination" 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" />
+    <column name="attribute_title" required="true" size="255" type="VARCHAR" />
+    <column name="attribute_chapo" type="LONGVARCHAR" />
+    <column name="attribute_description" type="CLOB" />
+    <column name="attribute_postscriptumn" type="LONGVARCHAR" />
+    <column name="attribute_av_title" required="true" size="255" type="VARCHAR" />
+    <column name="attribute_av_chapo" type="LONGVARCHAR" />
+    <column name="attribute_av_description" type="CLOB" />
+    <column name="attribute_av_postscriptum" type="LONGVARCHAR" />
     <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>

From a540626fff891eb2f38af5d7a1bb66762d2a766e Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Thu, 19 Sep 2013 18:47:12 +0200
Subject: [PATCH 28/51] fix product import

---
 install/import/products.csv                   |   2 +-
 templates/default/category.html               | 170 ++++++++++++++++++
 .../default/includes/category-toolbar.html    |  52 ++++++
 templates/default/product.html                |   6 +-
 4 files changed, 226 insertions(+), 4 deletions(-)
 create mode 100644 templates/default/includes/category-toolbar.html

diff --git a/install/import/products.csv b/install/import/products.csv
index d2d84fb53..b085feee2 100644
--- a/install/import/products.csv
+++ b/install/import/products.csv
@@ -18,7 +18,7 @@ Swivel feature for added function. ";"Zoe est un fauteuil contemporain qui combi
 "PROD013";"Violet";"A beautifull classic";"Une beauté classique";"A new edition of a classic. Beneath a beautiful colorfull leather, a strong walnut wood frame. You will appreciate the luxurious stylish details of the ''Violet'' armless chair. ";"La réédition d'un classique. Sous un superbe cuir aux couleurs chatoyantes, une solide structure en noyer. Vous apprécierez les détails stylistiques luxueux de notre chaise Violet. ";"Dimensions : Width : 19'' – Depth : 23'' – Height : 31''";"Dimensions : Larg. 50 cm – Prof.60 cm – Haut. 80 cm";98;;"PROD013-1.jpg";"MAGIS";"Gray";"Chairs"
 "PROD014";"Sally";"Contemporary atypical chair";"Chaise contemporaine hors normes";"Contemporary atypical chair. The atypical sitting of the ''Sally '' chair  will nestled you in confort. Play with the vibrant colours range to create a unique dining room. ";"Chaise contemporaine hors normes. L'assise surprenante de la chaise Sally vous enveloppera de confort. Amusez vous avec l'éventail de couleurs lumineuses pour créer une salle à manger unique. ";"Dimensions :  Width : 19'' – Depth : 23'' – Height : 31''";"Dimensions : Larg. 50 cm – Prof.60 cm – Haut. 80 cm";112;;"PROD014-1.jpg;PROD014-2.jpg;PROD014-3.jpg;PROD014-4.jpg";"PARRY";"blue;purple;orange;yellow";"Chairs"
 "PROD015";"Oliver";"Comfort & Design";"Confort et Design";"Surround yourself in ultra modern luxury with the ''Oliver'' armchair and get a look at the future ! Eye-catching, this unique combination of comfort and design is a must-have for today's book nook. ";"Abandonnez vous à un univers de luxe ultra moderne avec le fauteuil Oliver et voyagez dans le futur ! Cette combinaison unique de confort et de design est spectaculaire. Un élément incontournable pour votre bibliothèque. ";"Dimensions : Width : 30'' – Depth : 27'' – height : 31''";"Dimensions : Larg. 75 cm – Prof. 69 cm – Haut. 80 cm";340;;"PROD015-1.jpg;PROD015-2.jpg;";"MAGIS";"white;black";"Armchairs;Chairs"
-"PROD016";"Lexie";"A modern style";"Un style moderne";"Demonstrate your flair for modern style with our ''Lexie'' chair in your dining room. A rectangular cushioned back offers a contemporary feel, while the comfortable seat provides complete comfort. ";"Montrez que vous avez le sens de la modernité en choisissant  la chaise ''Lexie'' pour votre salle à manger. Le coussin rectangulaire sur le dossier apporte une touche contemporaine. L'assise généreuse apporte un confort complet. ";"Dimensions : Width : 19'' – Depth : 23'' – Height : 40''";"Dimensions : larg. 50 cm – Prof. 60 cm – Haut. 100 cm";159;;"PROD016-1.jpg";"PLINK";;"Chairs"
+"PROD016";"Lexie";"A modern style";"Un style moderne";"Demonstrate your flair for modern style with our ''Lexie'' chair in your dining room. A rectangular cushioned back offers a contemporary feel, while the comfortable seat provides complete comfort. ";"Montrez que vous avez le sens de la modernité en choisissant  la chaise ''Lexie'' pour votre salle à manger. Le coussin rectangulaire sur le dossier apporte une touche contemporaine. L'assise généreuse apporte un confort complet. ";"Dimensions : Width : 19'' – Depth : 23'' – Height : 40''";"Dimensions : larg. 50 cm – Prof. 60 cm – Haut. 100 cm";159;;"PROD016-1.jpg";"PLINK";"Beige";"Chairs"
 "PROD017";"Flynn";"A touch of retro vibe";"Un petit air rétro";"If your destination is up-to-date décor with a touch of retro vibe, look no further than our ''Flynn'' sofa. Sleek, low track arms and high tapering legs give this piece a mid-century flavor. The vibrant tones of the woven upholstery will easily blend with any interior décor. ";"Si vous recherchez une décoration actuelle avec une touche rétro, n'allez pas plus loin et opter pour notre canapé ''Flynn''. Ce canapé a un petit air des années 50 grâce à ses accoudoirs bas, ses pieds allongés et ses lignes pures. Les couleurs chatoyantes de son revêtement en laine lui permettent de se fondre dans tous les intérieurs. ";"Dimensions : Width : 89'' – Depth : 37'' – Height : 36''";"Dimensions : Larg. 225 cm – Prof. 95 cm – Haut. 90 cm";1299;;"PROD017-1.jpg;PROD017-2.jpg;PROD017-3.jpg;PROD017-4.jpg";"OFFUS";"blue;green;red;purple";"Sofas"
 "PROD018";"Emily";"A old-world feel";"Une touche d'histoire";"Our ''Emily''  armlesschair adds a touch of a old-world feel to your space. Perfect for when defining the seating space in a larger room. A medium wood finish sets off the delicate embellishments at the base, while the luxurous upholstery keeps the look fresh. The cushions guarantee that this is a chair worth relaxing in, not just admiring from afar. ";"La chaise ''Emily'' apporte une touche d'histoire à votre intérieur. Elle est parfaite pour structurer votre espace, notamment dans une grande pièce. Les finitions bois font la part belle à de délicates arabesques, tandis que le luxueux revêtement apporte un look frais. Cette chaise n'est pas destinée à la figuration grâce à la mousse confortable de l'assise. ";"Dimensions : Width : 33'' – Depth : 27'' – Height : 40''";"Dimensions : Larg. 85 cm – Prof. 69 cm – Haut. 100 cm";690;;"PROD018-1.jpg";"PARRY";"red";"Armchairs"
 "PROD019";"Edgar";"A special spot";"Un endroit à part";"A special spot for reading, lounging or chatting, our '' Edgar '' armchair has no reservations when it comes to style. The design starts with mid-century modern elements like lean arms, while the brushed stainless steel base ensures stability. Swivel feature for added function. ";"Un endroit spécial où lire, rêver ou discuter, notre fauteuil ''Edgar'' n'a pas de limite quand il s'agit de style. Son design part d'éléments contemporains comme ses accoudoirs bas et fins, tandis que sa base en inox brossé assure la stabilité de l'ensemble. Siège pivotant. ";"Dimensions : Width : 33'' – Depth : 27'' – Height : 40''";"Dimensions: Larg. 85 cm – Prof. 69 cm – Haut. 100 cm";275;;"PROD019-1.jpg;PROD019-2.jpg;PROD019-3.jpg;PROD019-4.jpg;PROD019-5.jpg";"TOKO";"blue;yellow;orange;pink;purple";"Armchairs"
diff --git a/templates/default/category.html b/templates/default/category.html
index 8bca4fbde..3ac31189a 100644
--- a/templates/default/category.html
+++ b/templates/default/category.html
@@ -17,3 +17,173 @@
         </ul>
     </nav><!-- /.nav-breadcrumb -->
 {/block}
+
+{block name="main-content"}
+    <div class="main layout-col-2-left">
+
+        <article class="col-main {$smarty.get.mode|default:"grid"}" role="main">
+            {include file="includes/category-toolbar.html" toolbar="top"}
+            <div id="category-products">
+                <div class="products-content">
+                    <ul class="product-col-4">
+                        {loop type="product" name="product_list" category={category attr="id"}}
+
+                        <li class="item">
+                        <article itemscope itemtype="http://schema.org/Product">
+                            <!-- Use the meta tag to specify content that is not visible on the page in any way -->
+                            <meta itemprop="brand" content="Diesel">
+                            <meta itemprop="productID" content="isbn:925872">
+
+                            <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
+                                {loop name="product_thumbnail" type="image" product=$ID width="218" height="146" resize_mode="borders" limit="1"}
+                                    <img itemprop="image" src="{$IMAGE_URL}" alt="Product #{$LOOP_COUNT}">
+                                {/loop}
+                                {elseloop rel="product_thumbnail"}
+                                    {images file='assets/img/218x146.png'}<img itemprop="image" src="{$asset_url}" alt="Product #{$LOOP_COUNT}">{/images}
+                                {/elseloop}
+                                <span class="mask"></span>
+                            </a>
+
+                            <div class="product-info">
+                                <h3 class="name"><a href="{$URL}"><span itemprop="name">{$TITLE}</span></a></h3>
+
+                                <div class="description" itemprop="description">
+                                    <p>{$DESCRIPTION}</p>
+                                </div>
+                            </div>
+
+                            <div class="product-price">
+                                <div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
+                                    <meta itemprop="category" content="Category1">
+                                    <meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition"> <!-- List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition -->
+                                    <meta itemprop="priceCurrency" content="USD"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
+                                    <link itemprop="availability" href="http://schema.org/InStock" content="in_stock" />
+                                    <!-- List of availibility :
+                                        out_of_stock : http://schema.org/OutOfStock
+                                        in_stock : http://schema.org/InStock
+                                        instore_only : http://schema.org/InStoreOnly
+                                        preorder : http://schema.org/PreOrder
+                                        online_only : http://schema.org/OnlineOnly
+                                    -->
+                                    {if $IS_PROMO }
+                                        {loop name="productSaleElements_promo" type="product_sale_elements" product=$ID limit="1" order="min_price"}
+                                         {assign var="default_product_sale_elements" value=$ID}
+                                        <span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number="{$TAXED_PROMO_PRICE}"} {currency attr="symbol"}</span></span>
+                                        <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number="{$TAXED_PRICE}"} {currency attr="symbol"}</span></span>
+                                        {/loop}
+                                    {else}
+                                        <span class="regular-price"><span itemprop="price" class="price">{format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"}</span></span>
+                                    {/if}
+
+                                </div>
+                                <div class="product-btn">
+                                    <a class="btn btn-cart" href="#">Add to cart</a>
+                                </div>
+                            </div>
+                        </article><!-- /product -->
+                        </li>
+                        {/loop}
+                    </ul>
+                </div>
+            </div><!-- /#category-products -->
+            {include file="includes/category-toolbar.html" toolbar="bottom"}
+        </article>
+
+        <aside class="col-left" role="complementary" itemscope itemtype="http://schema.org/WPSideBar">
+
+            <section id="categories" class="block block-nav" role="navigation" aria-labelledby="categories-label">
+                <div class="block-heading"><h3 class="block-title" id="categories-label">Categories</h3></div>
+                <div class="block-content">
+                    <nav class="nav-categories">
+                        <ul id="category" class="accordion">
+                            <li>
+                                <a class="accordion-toggle" data-toggle="collapse" data-parent="#category" href="#collapse1">Category 1 <span class="amount">(3)</span></a>
+                                <ul id="collapse1" class="in">
+                                    <li>
+                                        <a href="#collapse11" class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#collapse1">Category 1.1 <span class="amount">(3)</span></a>
+                                        <ul id="collapse11" class="collapse">
+                                            <li><a href="#">Category 1.1.1 <span class="amount">(0)</span></a></li>
+                                            <li>
+                                                <a href="#collapse112" class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#collapse11">Category 1.1.2 <span class="amount">(2)</span></a>
+                                                <ul id="collapse112" class="collapse">
+                                                    <li><a href="#">Category 1.1.2.1 <span class="amount">(0)</span></a></li>
+                                                    <li><a href="#">Category 1.1.2.2 <span class="amount">(0)</span></a></li>
+                                                </ul>
+
+                                            </li>
+                                            <li><a href="#">Category 1.1.3 <span class="amount">(0)</span></a></li>
+                                        </ul>
+
+                                    </li>
+                                    <li><a href="#">Category 1.2 <span class="amount">(0)</span></a></li>
+                                    <li><a href="#">Category 1.3 <span class="amount">(0)</span></a></li>
+                                </ul>
+                            </li>
+                            <li><a href="#">Category 2 <span class="amount">(0)</span></a></li>
+                            <li><a href="#">Category 3 <span class="amount">(0)</span></a></li>
+                            <li><a href="#">Category 4 <span class="amount">(0)</span></a></li>
+                        </ul>
+                    </nav>
+                </div>
+            </section>
+
+            <section id="filters">
+                <h3>Find <span>a product</span></h3>
+                <form id="form-filters" action="" method="get" role="form">
+                    <div class="filter filter-type">
+                        <fieldset>
+                            <legend class="filter-heading">Type</legend>
+                            <div class="filter-content">
+                                <?php for ($count = 1; $count <= $type; $count++) { ?>
+                                <div class="checkbox">
+                                    <label for="type<?php echo $count; ?>">
+                                        <input type="checkbox" name="type<?php echo $count; ?>" id="type<?php echo $count; ?>"<?php if(isset($_GET['type'. $count])) { echo ' checked'; }?> value="<?php echo $count; ?>"> Type <?php echo $count; ?>
+                                    </label>
+                                </div>
+                                <?php } ?>
+                            </div>
+                        </fieldset>
+                    </div><!-- /Filter Type -->
+
+                    <div class="filter filter-price">
+                        <fieldset>
+                            <legend class="filter-heading">Price</legend>
+                            <div class="filter-content">
+                                <?php foreach ($price as $key => $value) { ?>
+                                <div class="checkbox">
+                                    <label for="price<?php echo $key; ?>">
+                                        <input type="checkbox" name="price<?php echo $key; ?>" id="price<?php echo $key; ?>"<?php if(isset($_GET['price'. $key])) { echo ' checked'; }?> value="<?php echo $value; ?>"> <?php echo $value; ?>
+                                    </label>
+                                </div>
+                                <?php } ?>
+                            </div>
+                        </fieldset>
+                    </div><!-- /Filter Price -->
+
+                    <div class="filter filter-size">
+                        <fieldset>
+                            <legend class="filter-heading">Size</legend>
+                            <div class="filter-content">
+                                <?php foreach ($size as $key => $value) { ?>
+                                <div class="checkbox">
+                                    <label for="size<?php echo $key; ?>">
+                                        <input type="checkbox" name="size<?php echo $key; ?>" id="size<?php echo $key; ?>"<?php if(isset($_GET['size'. $key])) { echo ' checked'; }?> value="<?php echo $key; ?>"> <?php echo $value; ?>
+                                    </label>
+                                </div>
+                                <?php } ?>
+                            </div>
+                        </fieldset>
+                    </div><!-- /Filter Size -->
+
+                    <div class="group-btn">
+                        <button type="submit" class="btn btn-filter">Submit</button>
+                    </div>
+                </form>
+            </section><!-- /.filters -->
+
+        </aside>
+
+    </div>
+
+    </div><!-- /.container -->
+{/block}
diff --git a/templates/default/includes/category-toolbar.html b/templates/default/includes/category-toolbar.html
new file mode 100644
index 000000000..59a78151e
--- /dev/null
+++ b/templates/default/includes/category-toolbar.html
@@ -0,0 +1,52 @@
+<div class="toolbar toolbar-{$toolbar}" role="toolbar">
+    <div class="sorter-container">
+        <span class="amount">9 Item(s)</span>
+
+            <span class="limiter">
+                <label for="limit-top">Show</label>
+                <select id="limit-top" name="limit">
+                    <option value="?limit=4">4</option>
+                    <option value="?limit=8" selected>8</option>
+                    <option value="?limit=12">12</option>
+                    <option value="?limit=50">50</option>
+                    <option value="?limit=all">All</option>
+                </select>
+                <span class="per-page"> per page</span>
+            </span><!-- /.limiter -->
+
+            <span class="sort-by">
+                <label for="sortby-top">Sort By</label>
+                <select id="sortby-top" name="sortby" onchange="">
+                    <option value="?order=position">Position</option>
+                    <option value="?order=name" selected>Name</option>
+                    <option value="?order=price">Price</option>
+                    <option value="?order=rating">Rating</option>
+                </select>
+
+                <a class="sort-order" href="?dir=desc" title="Set Descending Direction"><i class="icon-long-arrow-up"></i></a>
+
+            </span><!-- /.sort-by -->
+
+            <span class="view-mode">
+                <span class="view-mode-label">View as:</span>
+                <span class="view-mode-btn">
+                    <a href="?mode=grid" data-toggle="view" role="button" class="btn btn-grid"><i class="icon-grid"></i></a>
+                    <a href="?mode=list" data-toggle="view" role="button" class="btn btn-list "><i class="icon-list"></i></a>
+                </span>
+            </span><!-- /.view-mode -->
+
+    </div><!-- /.sorter -->
+
+    <div class="pagination-container" role="pagination" aria-labelledby="pagination-label-{$toolbar}">
+        <strong id="pagination-label-{$toolbar}" class="pagination-label">Pagination</strong>
+        <ul class="pagination">
+            <li><a href="?page=<?php echo $page-1; ?>" class="prev"><i class="icon-prev"></i></a></li>
+            <li class="active"><a href="?page=1" tabindex="-1"'; >1</a></li>
+            <li><a href="?page=2">2</a></li>
+            <li><a href="?page=3">3</a></li>
+            <li><a href="?page=4">4</a></li>
+            <li><a href="?page=5">5</a></li>
+            <li><a href="?page=<?php echo $page+1; ?>" class="next"><i class="icon-next"></i></a></li>
+        </ul>
+    </div>
+</div><!-- /.toolbar toolbar-<?php echo $toolbar; ?> -->
diff --git a/templates/default/product.html b/templates/default/product.html
index c2135d232..63ad2364b 100644
--- a/templates/default/product.html
+++ b/templates/default/product.html
@@ -58,10 +58,10 @@
                         <div class="item">
                             <ul>
 
-                                {loop name="image.carouselsup" type="image" product="{$ID}"  width="560" height="445" resize_mode="crop" offset="5"}
+                                {loop name="image.carouselsup" type="image" product="{$ID}"  width="560" height="445" resize_mode="borders" offset="5"}
                                     <li>
                                         <a href="{$IMAGE_URL}" class="thumbnail">
-                                            {loop type="image" name="image.thumbssup" id="{$ID}" product="$OBJECT_ID" width="118" height="85" resize_mode="crop"}
+                                            {loop type="image" name="image.thumbssup" id="{$ID}" product="$OBJECT_ID" width="118" height="85" resize_mode="borders"}
                                                 <img src="{$IMAGE_URL}" alt="{$TITLE}">
                                             {/loop}
                                         </a>
@@ -111,7 +111,7 @@
                             <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number="{$TAXED_PRICE}"} {currency attr="symbol"}</span></span>
                         {/loop}
                         {else}
-                            <span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"}</span></span>
+                            <span class="regular-price"><span itemprop="price" class="price">{format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"}</span></span>
                         {/if}
                     </div>
                 </div>

From a7a755fab589c25cf0f962603afa667880f90ffc Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Thu, 19 Sep 2013 18:58:43 +0200
Subject: [PATCH 29/51] add isbn meta tag

---
 templates/default/category.html | 17 +++++++++++++----
 templates/default/product.html  | 10 +++++-----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/templates/default/category.html b/templates/default/category.html
index 3ac31189a..153dafc9d 100644
--- a/templates/default/category.html
+++ b/templates/default/category.html
@@ -31,8 +31,17 @@
                         <li class="item">
                         <article itemscope itemtype="http://schema.org/Product">
                             <!-- Use the meta tag to specify content that is not visible on the page in any way -->
-                            <meta itemprop="brand" content="Diesel">
-                            <meta itemprop="productID" content="isbn:925872">
+                            {$product_id=$ID}
+                            {loop name="brand.feature" type="feature" product=$ID title="brand"}
+                                {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
+                                            <meta itemprop="brand" content="{$TITLE}">
+                                {/loop}
+                            {/loop}
+                            {loop name="brand.feature" type="feature" product=$ID title="isbn"}
+                                {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
+                                    <meta itemprop="productID" content="isbn:{$TITLE}">
+                                {/loop}
+                            {/loop}
 
                             <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
                                 {loop name="product_thumbnail" type="image" product=$ID width="218" height="146" resize_mode="borders" limit="1"}
@@ -54,9 +63,9 @@
 
                             <div class="product-price">
                                 <div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-                                    <meta itemprop="category" content="Category1">
+                                    <meta itemprop="category" content="{category attr="title"}">
                                     <meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition"> <!-- List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition -->
-                                    <meta itemprop="priceCurrency" content="USD"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
+                                    <meta itemprop="priceCurrency" content="{currency attr="symbol"}"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
                                     <link itemprop="availability" href="http://schema.org/InStock" content="in_stock" />
                                     <!-- List of availibility :
                                         out_of_stock : http://schema.org/OutOfStock
diff --git a/templates/default/product.html b/templates/default/product.html
index 63ad2364b..d7600a8c5 100644
--- a/templates/default/product.html
+++ b/templates/default/product.html
@@ -26,11 +26,11 @@
                     <meta itemprop="brand" content="{$TITLE}">
                 {/loop}
             {/loop}
-
-            <!--
-                activate this meta tag if you have isbn feature for exemple
-                <meta itemprop="productID" content="isbn:925872">
-            -->
+            {loop name="brand.feature" type="feature" product=$ID title="isbn"}
+                {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
+                    <meta itemprop="productID" content="isbn:{$TITLE}">
+                {/loop}
+            {/loop}
 
             <section id="product-gallery">
                 <figure class="product-image">

From e1353a63a7e982b9eb0fce904ebabc4fa6361a23 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Thu, 19 Sep 2013 19:05:56 +0200
Subject: [PATCH 30/51] complete meta tag for product part

---
 templates/default/index.html   | 34 ++++++++++++++++++++++++++++------
 templates/default/product.html |  4 +++-
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/templates/default/index.html b/templates/default/index.html
index b762df42f..ca6fbbf7c 100644
--- a/templates/default/index.html
+++ b/templates/default/index.html
@@ -34,8 +34,17 @@
                 <li class="item">
                     <article itemscope itemtype="http://schema.org/Product">
                         <!-- Use the meta tag to specify content that is not visible on the page in any way -->
-                        <meta itemprop="brand" content="Diesel">
-                        <meta itemprop="productID" content="isbn:925872">
+                        {$product_id=$ID}
+                        {loop name="brand.feature" type="feature" product="{$ID}" title="brand"}
+                            {loop name="brand.value" type="feature_value" feature="{$ID}" product="$product_id"}
+                                <meta itemprop="brand" content="{$TITLE}">
+                            {/loop}
+                        {/loop}
+                        {loop name="brand.feature" type="feature" product=$ID title="isbn"}
+                            {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
+                                <meta itemprop="productID" content="isbn:{$TITLE}">
+                            {/loop}
+                        {/loop}
 
                         <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
                             {ifloop rel="image_product_new" }
@@ -57,7 +66,9 @@
 
                             <div class="product-price">
                                 <div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-                                    <meta itemprop="category" content="Category1">
+                                    {loop type="category" name="category_tag" id=$DEFAULT_CATEGORY}
+                                        <meta itemprop="category" content="{$TITLE}">
+                                    {/loop}
                                     <meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition"> <!-- List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition -->
                                     <meta itemprop="priceCurrency" content="{currency attr="code"}"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
                                     <link itemprop="availability" href="http://schema.org/InStock" content="in_stock" />
@@ -93,8 +104,17 @@
                 <li class="item">
                     <article itemscope itemtype="http://schema.org/Product">
                         <!-- Use the meta tag to specify content that is not visible on the page in any way -->
-                        <meta itemprop="brand" content="Diesel">
-                        <meta itemprop="productID" content="isbn:925872">
+                        {$product_id=$ID}
+                        {loop name="brand.feature" type="feature" product="{$ID}" title="brand"}
+                            {loop name="brand.value" type="feature_value" feature="{$ID}" product="$product_id"}
+                                <meta itemprop="brand" content="{$TITLE}">
+                            {/loop}
+                        {/loop}
+                        {loop name="brand.feature" type="feature" product=$ID title="isbn"}
+                            {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
+                                <meta itemprop="productID" content="isbn:{$TITLE}">
+                            {/loop}
+                        {/loop}
 
                         <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
                             {ifloop rel="image_product_promo" }
@@ -116,7 +136,9 @@
 
                         <div class="product-price">
                             <div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-                                <meta itemprop="category" content="Category1">
+                                {loop type="category" name="category_tag" id=$DEFAULT_CATEGORY}
+                                <meta itemprop="category" content="{$TITLE}">
+                                {/loop}
                                 <meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition"> <!-- List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition -->
                                 <meta itemprop="priceCurrency" content="{currency attr="code"}"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
                                 <link itemprop="availability" href="http://schema.org/InStock" content="in_stock" />
diff --git a/templates/default/product.html b/templates/default/product.html
index d7600a8c5..dc89eb03b 100644
--- a/templates/default/product.html
+++ b/templates/default/product.html
@@ -93,7 +93,9 @@
                     <div class="availability"><span class="availibity-label">{intl l="Availability"}: </span><span itemprop="availability" href="http://schema.org/InStock" class="in-stock">In stock</span></div>
 
                     <div class="price-container">
-                        <meta itemprop="category" content="Category1">
+                        {loop type="category" name="category_tag" id=$DEFAULT_CATEGORY}
+                            <meta itemprop="category" content="{$TITLE}">
+                        {/loop}
                         <meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition"> <!-- List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition -->
                         <meta itemprop="priceCurrency" content="{currency attr="symbol"}"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
                         <link itemprop="availability" href="http://schema.org/InStock" content="in_stock" />

From 6e9af5940361ecb446c3b2874a2366467a5b15b3 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Thu, 19 Sep 2013 19:56:59 +0200
Subject: [PATCH 31/51] order creation

---
 core/lib/Thelia/Action/Order.php              |  111 +-
 .../Controller/Front/BaseFrontController.php  |    6 +-
 .../Controller/Front/OrderController.php      |    5 +-
 core/lib/Thelia/Core/Event/TheliaEvents.php   |    5 +-
 core/lib/Thelia/Exception/OrderException.php  |    3 +
 core/lib/Thelia/Form/OrderDelivery.php        |    2 +-
 core/lib/Thelia/Model/Base/OrderProduct.php   | 2466 +++++++++++++++++
 .../Thelia/Model/Base/OrderProductQuery.php   | 1244 +++++++++
 .../Thelia/Model/Map/OrderProductTableMap.php |  561 ++++
 core/lib/Thelia/Model/Order.php               |  180 +-
 core/lib/Thelia/Model/OrderProduct.php        |   31 +
 core/lib/Thelia/Model/OrderProductQuery.php   |   21 +
 12 files changed, 4622 insertions(+), 13 deletions(-)
 create mode 100644 core/lib/Thelia/Model/Base/OrderProduct.php
 create mode 100644 core/lib/Thelia/Model/Base/OrderProductQuery.php
 create mode 100644 core/lib/Thelia/Model/Map/OrderProductTableMap.php
 create mode 100644 core/lib/Thelia/Model/OrderProduct.php
 create mode 100644 core/lib/Thelia/Model/OrderProductQuery.php

diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php
index c5926acea..fda052316 100755
--- a/core/lib/Thelia/Action/Order.php
+++ b/core/lib/Thelia/Action/Order.php
@@ -23,12 +23,23 @@
 
 namespace Thelia\Action;
 
+use Propel\Runtime\ActiveQuery\ModelCriteria;
+use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
 use Propel\Runtime\Exception\PropelException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Thelia\Core\Event\OrderEvent;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Model\Base\AddressQuery;
+use Thelia\Exception\OrderException;
+use Thelia\Model\AttributeAvI18n;
+use Thelia\Model\AttributeAvI18nQuery;
+use Thelia\Model\AttributeI18n;
+use Thelia\Model\AttributeI18nQuery;
+use Thelia\Model\AttributeQuery;
+use Thelia\Model\AddressQuery;
+use Thelia\Model\OrderAttributeCombination;
+use Thelia\Model\ProductI18nQuery;
+use Thelia\Model\Lang;
 use Thelia\Model\ModuleQuery;
 use Thelia\Model\OrderProduct;
 use Thelia\Model\OrderStatus;
@@ -36,6 +47,7 @@ use Thelia\Model\Map\OrderTableMap;
 use Thelia\Model\OrderAddress;
 use Thelia\Model\OrderStatusQuery;
 use Thelia\Model\ConfigQuery;
+use Thelia\Model\ProductI18n;
 
 /**
  *
@@ -167,15 +179,68 @@ class Order extends BaseAction implements EventSubscriberInterface
 
         $placedOrder->save($con);
 
-        /* fulfill order_products and decrease stock // @todo + dispatch event */
+        /* fulfill order_products and decrease stock */
 
         foreach($cartItems as $cartItem) {
+            $product = $cartItem->getProduct();
+
+            /* get customer translation */
+            $productI18n = $this->getI18n(ProductI18nQuery::create(), new ProductI18n(), $product->getId());
+
+            $pse = $cartItem->getProductSaleElements();
+
+            /* check still in stock */
+            if($cartItem->getQuantity() > $pse->getQuantity()) {
+                $e = new OrderException("Not enough stock", OrderException::NOT_ENOUGH_STOCK);
+                $e->cartItem = $cartItem;
+                throw $e;
+            }
+
+            /* decrease stock */
+            $pse->setQuantity(
+                $pse->getQuantity() - $cartItem->getQuantity()
+            );
+            $pse->save();
+
             $orderProduct = new OrderProduct();
             $orderProduct
                 ->setOrderId($placedOrder->getId())
+                ->setProductRef($product->getRef())
+                ->setProductSaleElementsRef($pse->getRef())
+                ->setTitle($productI18n->getTitle())
+                ->setChapo($productI18n->getChapo())
+                ->setDescription($productI18n->getDescription())
+                ->setPostscriptum($productI18n->getPostscriptum())
+                ->setQuantity($cartItem->getQuantity())
+                ->setPrice($cartItem->getPrice())
+                ->setPromoPrice($cartItem->getPromoPrice())
+                ->setWasNew($pse->getNewness())
+                ->setWasInPromo($cartItem->getPromo())
+                ->setWeight($pse->getWeight())
             ;
+            $orderProduct->setDispatcher($this->getDispatcher());
+            $orderProduct->save();
 
-            $in = true;
+            /* fulfill order_attribute_combination and decrease stock */
+            foreach($pse->getAttributeCombinations() as $attributeCombination) {
+                $attribute = $this->getI18n(AttributeI18nQuery::create(), new AttributeI18n(), $attributeCombination->getAttributeId());
+                $attributeAv = $this->getI18n(AttributeAvI18nQuery::create(), new AttributeAvI18n(), $attributeCombination->getAttributeAvId());
+
+                $orderAttributeCombination = new OrderAttributeCombination();
+                $orderAttributeCombination
+                    ->setOrderProductId($orderProduct->getId())
+                    ->setAttributeTitle($attribute->getTitle())
+                    ->setAttributeChapo($attribute->getChapo())
+                    ->setAttributeDescription($attribute->getDescription())
+                    ->setAttributePostscriptumn($attribute->getPostscriptum())
+                    ->setAttributeAvTitle($attributeAv->getTitle())
+                    ->setAttributeAvChapo($attributeAv->getChapo())
+                    ->setAttributeAvDescription($attributeAv->getDescription())
+                    ->setAttributeAvPostscriptum($attributeAv->getPostscriptum())
+                ;
+
+                $orderAttributeCombination->save();
+            }
         }
 
         /* discount @todo */
@@ -239,7 +304,7 @@ class Order extends BaseAction implements EventSubscriberInterface
             TheliaEvents::ORDER_SET_INVOICE_ADDRESS => array("setInvoiceAddress", 128),
             TheliaEvents::ORDER_SET_PAYMENT_MODULE => array("setPaymentModule", 128),
             TheliaEvents::ORDER_PAY => array("create", 128),
-            TheliaEvents::ORDER_SET_REFERENCE => array("setReference", 128),
+            TheliaEvents::ORDER_BEFORE_CREATE => array("setReference", 128),
         );
     }
 
@@ -272,4 +337,42 @@ class Order extends BaseAction implements EventSubscriberInterface
 
         return $request->getSession();
     }
+
+    /**
+     * @param ModelCriteria         $query
+     * @param ActiveRecordInterface $object
+     * @param                       $id
+     * @param array                 $needed = array('Title')
+     *
+     * @return ProductI18n
+     */
+    protected function getI18n(ModelCriteria $query, ActiveRecordInterface $object, $id, $needed = array('Title'))
+    {
+        $i18n = $query
+            ->filterById($id)
+            ->filterByLocale(
+                $this->getSession()->getLang()->getLocale()
+            )->findOne();
+        /* or default translation */
+        if(null === $i18n) {
+            $i18n = $query
+                ->filterById($id)
+                ->filterByLocale(
+                    Lang::getDefaultLanguage()->getLocale()
+                )->findOne();
+        }
+        if(null === $i18n) { // @todo something else ?
+            $i18n = $object;
+            foreach($needed as $need) {
+                $method = sprintf('get%s', $need);
+                if(method_exists($i18n, $method)) {
+                    $i18n->$method('DEFAULT ' . strtoupper($need));
+                } else {
+                    // @todo throw sg ?
+                }
+            }
+        }
+
+        return $i18n;
+    }
 }
diff --git a/core/lib/Thelia/Controller/Front/BaseFrontController.php b/core/lib/Thelia/Controller/Front/BaseFrontController.php
index b8a7c6a98..152c2c10e 100755
--- a/core/lib/Thelia/Controller/Front/BaseFrontController.php
+++ b/core/lib/Thelia/Controller/Front/BaseFrontController.php
@@ -24,6 +24,8 @@ namespace Thelia\Controller\Front;
 
 use Symfony\Component\Routing\Router;
 use Thelia\Controller\BaseController;
+use Thelia\Model\AddressQuery;
+use Thelia\Model\ModuleQuery;
 use Thelia\Tools\URL;
 
 class BaseFrontController extends BaseController
@@ -69,7 +71,7 @@ class BaseFrontController extends BaseController
     protected function checkValidDelivery()
     {
         $order = $this->getSession()->getOrder();
-        if(null === $order || null === $order->chosenDeliveryAddress || null === $order->getDeliveryModuleId()) {
+        if(null === $order || null === $order->chosenDeliveryAddress || null === $order->getDeliveryModuleId() || null === AddressQuery::create()->findPk($order->chosenDeliveryAddress) || null === ModuleQuery::create()->findPk($order->getDeliveryModuleId())) {
             $this->redirectToRoute("order.delivery");
         }
     }
@@ -77,7 +79,7 @@ class BaseFrontController extends BaseController
     protected function checkValidInvoice()
     {
         $order = $this->getSession()->getOrder();
-        if(null === $order || null === $order->chosenInvoiceAddress || null === $order->getPaymentModuleId()) {
+        if(null === $order || null === $order->chosenInvoiceAddress || null === $order->getPaymentModuleId() || null === AddressQuery::create()->findPk($order->chosenInvoiceAddress) || null === ModuleQuery::create()->findPk($order->getPaymentModuleId())) {
             $this->redirectToRoute("order.invoice");
         }
     }
diff --git a/core/lib/Thelia/Controller/Front/OrderController.php b/core/lib/Thelia/Controller/Front/OrderController.php
index 53d1e070b..4dd678a82 100755
--- a/core/lib/Thelia/Controller/Front/OrderController.php
+++ b/core/lib/Thelia/Controller/Front/OrderController.php
@@ -78,11 +78,8 @@ class OrderController extends BaseFrontController
                 throw new \Exception("Delivery module cannot be use with selected delivery address");
             }
 
-            /* try to get postage amount */
+            /* get postage amount */
             $moduleReflection = new \ReflectionClass($deliveryModule->getFullNamespace());
-            if ($moduleReflection->isSubclassOf("Thelia\Module\DeliveryModuleInterface") === false) {
-                throw new \RuntimeException(sprintf("delivery module %s is not a Thelia\Module\DeliveryModuleInterface", $deliveryModule->getCode()));
-            }
             $moduleInstance = $moduleReflection->newInstance();
             $postage = $moduleInstance->getPostage($deliveryAddress->getCountry());
 
diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php
index 3b049bfef..80d87cc8c 100755
--- a/core/lib/Thelia/Core/Event/TheliaEvents.php
+++ b/core/lib/Thelia/Core/Event/TheliaEvents.php
@@ -220,7 +220,10 @@ final class TheliaEvents
     const ORDER_SET_INVOICE_ADDRESS = "action.order.setInvoiceAddress";
     const ORDER_SET_PAYMENT_MODULE = "action.order.setPaymentModule";
     const ORDER_PAY = "action.order.pay";
-    const ORDER_SET_REFERENCE = "action.order.setReference";
+    const ORDER_BEFORE_CREATE = "action.order.beforeCreate";
+    const ORDER_AFTER_CREATE = "action.order.afterCreate";
+    const ORDER_PRODUCT_BEFORE_CREATE = "action.orderProduct.beforeCreate";
+    const ORDER_PRODUCT_AFTER_CREATE = "action.orderProduct.afterCreate";
 
     /**
      * Sent on image processing
diff --git a/core/lib/Thelia/Exception/OrderException.php b/core/lib/Thelia/Exception/OrderException.php
index 70fd21c01..68eb36474 100755
--- a/core/lib/Thelia/Exception/OrderException.php
+++ b/core/lib/Thelia/Exception/OrderException.php
@@ -30,6 +30,7 @@ class OrderException extends \RuntimeException
      */
     public $cartRoute = "cart.view";
     public $orderDeliveryRoute = "order.delivery";
+    public $cartItem = null;
 
     public $arguments = array();
 
@@ -39,6 +40,8 @@ class OrderException extends \RuntimeException
 
     const UNDEFINED_DELIVERY = 200;
 
+    const NOT_ENOUGH_STOCK = 300;
+
     public function __construct($message, $code = null, $arguments = array(), $previous = null)
     {
         if(is_array($arguments)) {
diff --git a/core/lib/Thelia/Form/OrderDelivery.php b/core/lib/Thelia/Form/OrderDelivery.php
index e23ae92b2..8cddb5bd9 100755
--- a/core/lib/Thelia/Form/OrderDelivery.php
+++ b/core/lib/Thelia/Form/OrderDelivery.php
@@ -80,7 +80,7 @@ class OrderDelivery extends BaseForm
             ->filterByType(BaseModule::DELIVERY_MODULE_TYPE)
             ->filterByActivate(1)
             ->filterById($value)
-            ->find();
+            ->findOne();
 
         if(null === $module) {
             $context->addViolation("Delivery module ID not found");
diff --git a/core/lib/Thelia/Model/Base/OrderProduct.php b/core/lib/Thelia/Model/Base/OrderProduct.php
new file mode 100644
index 000000000..3d72eee6e
--- /dev/null
+++ b/core/lib/Thelia/Model/Base/OrderProduct.php
@@ -0,0 +1,2466 @@
+<?php
+
+namespace Thelia\Model\Base;
+
+use \DateTime;
+use \Exception;
+use \PDO;
+use Propel\Runtime\Propel;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
+use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
+use Propel\Runtime\Collection\Collection;
+use Propel\Runtime\Collection\ObjectCollection;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Exception\BadMethodCallException;
+use Propel\Runtime\Exception\PropelException;
+use Propel\Runtime\Map\TableMap;
+use Propel\Runtime\Parser\AbstractParser;
+use Propel\Runtime\Util\PropelDateTime;
+use Thelia\Model\Order as ChildOrder;
+use Thelia\Model\OrderAttributeCombination as ChildOrderAttributeCombination;
+use Thelia\Model\OrderAttributeCombinationQuery as ChildOrderAttributeCombinationQuery;
+use Thelia\Model\OrderProduct as ChildOrderProduct;
+use Thelia\Model\OrderProductQuery as ChildOrderProductQuery;
+use Thelia\Model\OrderQuery as ChildOrderQuery;
+use Thelia\Model\Map\OrderProductTableMap;
+
+abstract class OrderProduct implements ActiveRecordInterface
+{
+    /**
+     * TableMap class name
+     */
+    const TABLE_MAP = '\\Thelia\\Model\\Map\\OrderProductTableMap';
+
+
+    /**
+     * attribute to determine if this object has previously been saved.
+     * @var boolean
+     */
+    protected $new = true;
+
+    /**
+     * attribute to determine whether this object has been deleted.
+     * @var boolean
+     */
+    protected $deleted = false;
+
+    /**
+     * The columns that have been modified in current object.
+     * Tracking modified columns allows us to only update modified columns.
+     * @var array
+     */
+    protected $modifiedColumns = array();
+
+    /**
+     * The (virtual) columns that are added at runtime
+     * The formatters can add supplementary columns based on a resultset
+     * @var array
+     */
+    protected $virtualColumns = array();
+
+    /**
+     * The value for the id field.
+     * @var        int
+     */
+    protected $id;
+
+    /**
+     * The value for the order_id field.
+     * @var        int
+     */
+    protected $order_id;
+
+    /**
+     * The value for the product_ref field.
+     * @var        string
+     */
+    protected $product_ref;
+
+    /**
+     * The value for the product_sale_elements_ref field.
+     * @var        string
+     */
+    protected $product_sale_elements_ref;
+
+    /**
+     * The value for the title field.
+     * @var        string
+     */
+    protected $title;
+
+    /**
+     * The value for the chapo field.
+     * @var        string
+     */
+    protected $chapo;
+
+    /**
+     * The value for the description field.
+     * @var        string
+     */
+    protected $description;
+
+    /**
+     * The value for the postscriptum field.
+     * @var        string
+     */
+    protected $postscriptum;
+
+    /**
+     * The value for the quantity field.
+     * @var        double
+     */
+    protected $quantity;
+
+    /**
+     * The value for the price field.
+     * @var        double
+     */
+    protected $price;
+
+    /**
+     * The value for the promo_price field.
+     * @var        string
+     */
+    protected $promo_price;
+
+    /**
+     * The value for the was_new field.
+     * @var        int
+     */
+    protected $was_new;
+
+    /**
+     * The value for the was_in_promo field.
+     * @var        int
+     */
+    protected $was_in_promo;
+
+    /**
+     * The value for the weight field.
+     * @var        string
+     */
+    protected $weight;
+
+    /**
+     * The value for the tax field.
+     * @var        double
+     */
+    protected $tax;
+
+    /**
+     * The value for the parent field.
+     * @var        int
+     */
+    protected $parent;
+
+    /**
+     * The value for the created_at field.
+     * @var        string
+     */
+    protected $created_at;
+
+    /**
+     * The value for the updated_at field.
+     * @var        string
+     */
+    protected $updated_at;
+
+    /**
+     * @var        Order
+     */
+    protected $aOrder;
+
+    /**
+     * @var        ObjectCollection|ChildOrderAttributeCombination[] Collection to store aggregation of ChildOrderAttributeCombination objects.
+     */
+    protected $collOrderAttributeCombinations;
+    protected $collOrderAttributeCombinationsPartial;
+
+    /**
+     * Flag to prevent endless save loop, if this object is referenced
+     * by another object which falls in this transaction.
+     *
+     * @var boolean
+     */
+    protected $alreadyInSave = false;
+
+    /**
+     * An array of objects scheduled for deletion.
+     * @var ObjectCollection
+     */
+    protected $orderAttributeCombinationsScheduledForDeletion = null;
+
+    /**
+     * Initializes internal state of Thelia\Model\Base\OrderProduct object.
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Returns whether the object has been modified.
+     *
+     * @return boolean True if the object has been modified.
+     */
+    public function isModified()
+    {
+        return !empty($this->modifiedColumns);
+    }
+
+    /**
+     * Has specified column been modified?
+     *
+     * @param  string  $col column fully qualified name (TableMap::TYPE_COLNAME), e.g. Book::AUTHOR_ID
+     * @return boolean True if $col has been modified.
+     */
+    public function isColumnModified($col)
+    {
+        return in_array($col, $this->modifiedColumns);
+    }
+
+    /**
+     * Get the columns that have been modified in this object.
+     * @return array A unique list of the modified column names for this object.
+     */
+    public function getModifiedColumns()
+    {
+        return array_unique($this->modifiedColumns);
+    }
+
+    /**
+     * Returns whether the object has ever been saved.  This will
+     * be false, if the object was retrieved from storage or was created
+     * and then saved.
+     *
+     * @return true, if the object has never been persisted.
+     */
+    public function isNew()
+    {
+        return $this->new;
+    }
+
+    /**
+     * Setter for the isNew attribute.  This method will be called
+     * by Propel-generated children and objects.
+     *
+     * @param boolean $b the state of the object.
+     */
+    public function setNew($b)
+    {
+        $this->new = (Boolean) $b;
+    }
+
+    /**
+     * Whether this object has been deleted.
+     * @return boolean The deleted state of this object.
+     */
+    public function isDeleted()
+    {
+        return $this->deleted;
+    }
+
+    /**
+     * Specify whether this object has been deleted.
+     * @param  boolean $b The deleted state of this object.
+     * @return void
+     */
+    public function setDeleted($b)
+    {
+        $this->deleted = (Boolean) $b;
+    }
+
+    /**
+     * Sets the modified state for the object to be false.
+     * @param  string $col If supplied, only the specified column is reset.
+     * @return void
+     */
+    public function resetModified($col = null)
+    {
+        if (null !== $col) {
+            while (false !== ($offset = array_search($col, $this->modifiedColumns))) {
+                array_splice($this->modifiedColumns, $offset, 1);
+            }
+        } else {
+            $this->modifiedColumns = array();
+        }
+    }
+
+    /**
+     * Compares this with another <code>OrderProduct</code> instance.  If
+     * <code>obj</code> is an instance of <code>OrderProduct</code>, delegates to
+     * <code>equals(OrderProduct)</code>.  Otherwise, returns <code>false</code>.
+     *
+     * @param      obj The object to compare to.
+     * @return Whether equal to the object specified.
+     */
+    public function equals($obj)
+    {
+        $thisclazz = get_class($this);
+        if (!is_object($obj) || !($obj instanceof $thisclazz)) {
+            return false;
+        }
+
+        if ($this === $obj) {
+            return true;
+        }
+
+        if (null === $this->getPrimaryKey()
+            || null === $obj->getPrimaryKey())  {
+            return false;
+        }
+
+        return $this->getPrimaryKey() === $obj->getPrimaryKey();
+    }
+
+    /**
+     * If the primary key is not null, return the hashcode of the
+     * primary key. Otherwise, return the hash code of the object.
+     *
+     * @return int Hashcode
+     */
+    public function hashCode()
+    {
+        if (null !== $this->getPrimaryKey()) {
+            return crc32(serialize($this->getPrimaryKey()));
+        }
+
+        return crc32(serialize(clone $this));
+    }
+
+    /**
+     * Get the associative array of the virtual columns in this object
+     *
+     * @param string $name The virtual column name
+     *
+     * @return array
+     */
+    public function getVirtualColumns()
+    {
+        return $this->virtualColumns;
+    }
+
+    /**
+     * Checks the existence of a virtual column in this object
+     *
+     * @return boolean
+     */
+    public function hasVirtualColumn($name)
+    {
+        return array_key_exists($name, $this->virtualColumns);
+    }
+
+    /**
+     * Get the value of a virtual column in this object
+     *
+     * @return mixed
+     */
+    public function getVirtualColumn($name)
+    {
+        if (!$this->hasVirtualColumn($name)) {
+            throw new PropelException(sprintf('Cannot get value of inexistent virtual column %s.', $name));
+        }
+
+        return $this->virtualColumns[$name];
+    }
+
+    /**
+     * Set the value of a virtual column in this object
+     *
+     * @param string $name  The virtual column name
+     * @param mixed  $value The value to give to the virtual column
+     *
+     * @return OrderProduct The current object, for fluid interface
+     */
+    public function setVirtualColumn($name, $value)
+    {
+        $this->virtualColumns[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Logs a message using Propel::log().
+     *
+     * @param  string  $msg
+     * @param  int     $priority One of the Propel::LOG_* logging levels
+     * @return boolean
+     */
+    protected function log($msg, $priority = Propel::LOG_INFO)
+    {
+        return Propel::log(get_class($this) . ': ' . $msg, $priority);
+    }
+
+    /**
+     * Populate the current object from a string, using a given parser format
+     * <code>
+     * $book = new Book();
+     * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
+     * </code>
+     *
+     * @param mixed $parser A AbstractParser instance,
+     *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
+     * @param string $data The source data to import from
+     *
+     * @return OrderProduct The current object, for fluid interface
+     */
+    public function importFrom($parser, $data)
+    {
+        if (!$parser instanceof AbstractParser) {
+            $parser = AbstractParser::getParser($parser);
+        }
+
+        return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME);
+    }
+
+    /**
+     * Export the current object properties to a string, using a given parser format
+     * <code>
+     * $book = BookQuery::create()->findPk(9012);
+     * echo $book->exportTo('JSON');
+     *  => {"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
+     * </code>
+     *
+     * @param  mixed   $parser                 A AbstractParser instance, or a format name ('XML', 'YAML', 'JSON', 'CSV')
+     * @param  boolean $includeLazyLoadColumns (optional) Whether to include lazy load(ed) columns. Defaults to TRUE.
+     * @return string  The exported data
+     */
+    public function exportTo($parser, $includeLazyLoadColumns = true)
+    {
+        if (!$parser instanceof AbstractParser) {
+            $parser = AbstractParser::getParser($parser);
+        }
+
+        return $parser->fromArray($this->toArray(TableMap::TYPE_PHPNAME, $includeLazyLoadColumns, array(), true));
+    }
+
+    /**
+     * Clean up internal collections prior to serializing
+     * Avoids recursive loops that turn into segmentation faults when serializing
+     */
+    public function __sleep()
+    {
+        $this->clearAllReferences();
+
+        return array_keys(get_object_vars($this));
+    }
+
+    /**
+     * Get the [id] column value.
+     *
+     * @return   int
+     */
+    public function getId()
+    {
+
+        return $this->id;
+    }
+
+    /**
+     * Get the [order_id] column value.
+     *
+     * @return   int
+     */
+    public function getOrderId()
+    {
+
+        return $this->order_id;
+    }
+
+    /**
+     * Get the [product_ref] column value.
+     *
+     * @return   string
+     */
+    public function getProductRef()
+    {
+
+        return $this->product_ref;
+    }
+
+    /**
+     * Get the [product_sale_elements_ref] column value.
+     *
+     * @return   string
+     */
+    public function getProductSaleElementsRef()
+    {
+
+        return $this->product_sale_elements_ref;
+    }
+
+    /**
+     * Get the [title] column value.
+     *
+     * @return   string
+     */
+    public function getTitle()
+    {
+
+        return $this->title;
+    }
+
+    /**
+     * Get the [chapo] column value.
+     *
+     * @return   string
+     */
+    public function getChapo()
+    {
+
+        return $this->chapo;
+    }
+
+    /**
+     * Get the [description] column value.
+     *
+     * @return   string
+     */
+    public function getDescription()
+    {
+
+        return $this->description;
+    }
+
+    /**
+     * Get the [postscriptum] column value.
+     *
+     * @return   string
+     */
+    public function getPostscriptum()
+    {
+
+        return $this->postscriptum;
+    }
+
+    /**
+     * Get the [quantity] column value.
+     *
+     * @return   double
+     */
+    public function getQuantity()
+    {
+
+        return $this->quantity;
+    }
+
+    /**
+     * Get the [price] column value.
+     *
+     * @return   double
+     */
+    public function getPrice()
+    {
+
+        return $this->price;
+    }
+
+    /**
+     * Get the [promo_price] column value.
+     *
+     * @return   string
+     */
+    public function getPromoPrice()
+    {
+
+        return $this->promo_price;
+    }
+
+    /**
+     * Get the [was_new] column value.
+     *
+     * @return   int
+     */
+    public function getWasNew()
+    {
+
+        return $this->was_new;
+    }
+
+    /**
+     * Get the [was_in_promo] column value.
+     *
+     * @return   int
+     */
+    public function getWasInPromo()
+    {
+
+        return $this->was_in_promo;
+    }
+
+    /**
+     * Get the [weight] column value.
+     *
+     * @return   string
+     */
+    public function getWeight()
+    {
+
+        return $this->weight;
+    }
+
+    /**
+     * Get the [tax] column value.
+     *
+     * @return   double
+     */
+    public function getTax()
+    {
+
+        return $this->tax;
+    }
+
+    /**
+     * Get the [parent] column value.
+     * not managed yet
+     * @return   int
+     */
+    public function getParent()
+    {
+
+        return $this->parent;
+    }
+
+    /**
+     * Get the [optionally formatted] temporal [created_at] column value.
+     *
+     *
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
+     *                            If format is NULL, then the raw \DateTime object will be returned.
+     *
+     * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
+     *
+     * @throws PropelException - if unable to parse/validate the date/time value.
+     */
+    public function getCreatedAt($format = NULL)
+    {
+        if ($format === null) {
+            return $this->created_at;
+        } else {
+            return $this->created_at !== null ? $this->created_at->format($format) : null;
+        }
+    }
+
+    /**
+     * Get the [optionally formatted] temporal [updated_at] column value.
+     *
+     *
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
+     *                            If format is NULL, then the raw \DateTime object will be returned.
+     *
+     * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
+     *
+     * @throws PropelException - if unable to parse/validate the date/time value.
+     */
+    public function getUpdatedAt($format = NULL)
+    {
+        if ($format === null) {
+            return $this->updated_at;
+        } else {
+            return $this->updated_at !== null ? $this->updated_at->format($format) : null;
+        }
+    }
+
+    /**
+     * Set the value of [id] column.
+     *
+     * @param      int $v new value
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setId($v)
+    {
+        if ($v !== null) {
+            $v = (int) $v;
+        }
+
+        if ($this->id !== $v) {
+            $this->id = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::ID;
+        }
+
+
+        return $this;
+    } // setId()
+
+    /**
+     * Set the value of [order_id] column.
+     *
+     * @param      int $v new value
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setOrderId($v)
+    {
+        if ($v !== null) {
+            $v = (int) $v;
+        }
+
+        if ($this->order_id !== $v) {
+            $this->order_id = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::ORDER_ID;
+        }
+
+        if ($this->aOrder !== null && $this->aOrder->getId() !== $v) {
+            $this->aOrder = null;
+        }
+
+
+        return $this;
+    } // setOrderId()
+
+    /**
+     * Set the value of [product_ref] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setProductRef($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->product_ref !== $v) {
+            $this->product_ref = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::PRODUCT_REF;
+        }
+
+
+        return $this;
+    } // setProductRef()
+
+    /**
+     * Set the value of [product_sale_elements_ref] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setProductSaleElementsRef($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->product_sale_elements_ref !== $v) {
+            $this->product_sale_elements_ref = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF;
+        }
+
+
+        return $this;
+    } // setProductSaleElementsRef()
+
+    /**
+     * Set the value of [title] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setTitle($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->title !== $v) {
+            $this->title = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::TITLE;
+        }
+
+
+        return $this;
+    } // setTitle()
+
+    /**
+     * Set the value of [chapo] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setChapo($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->chapo !== $v) {
+            $this->chapo = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::CHAPO;
+        }
+
+
+        return $this;
+    } // setChapo()
+
+    /**
+     * Set the value of [description] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setDescription($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->description !== $v) {
+            $this->description = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::DESCRIPTION;
+        }
+
+
+        return $this;
+    } // setDescription()
+
+    /**
+     * Set the value of [postscriptum] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setPostscriptum($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->postscriptum !== $v) {
+            $this->postscriptum = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::POSTSCRIPTUM;
+        }
+
+
+        return $this;
+    } // setPostscriptum()
+
+    /**
+     * Set the value of [quantity] column.
+     *
+     * @param      double $v new value
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setQuantity($v)
+    {
+        if ($v !== null) {
+            $v = (double) $v;
+        }
+
+        if ($this->quantity !== $v) {
+            $this->quantity = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::QUANTITY;
+        }
+
+
+        return $this;
+    } // setQuantity()
+
+    /**
+     * Set the value of [price] column.
+     *
+     * @param      double $v new value
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setPrice($v)
+    {
+        if ($v !== null) {
+            $v = (double) $v;
+        }
+
+        if ($this->price !== $v) {
+            $this->price = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::PRICE;
+        }
+
+
+        return $this;
+    } // setPrice()
+
+    /**
+     * Set the value of [promo_price] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setPromoPrice($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->promo_price !== $v) {
+            $this->promo_price = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::PROMO_PRICE;
+        }
+
+
+        return $this;
+    } // setPromoPrice()
+
+    /**
+     * Set the value of [was_new] column.
+     *
+     * @param      int $v new value
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setWasNew($v)
+    {
+        if ($v !== null) {
+            $v = (int) $v;
+        }
+
+        if ($this->was_new !== $v) {
+            $this->was_new = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::WAS_NEW;
+        }
+
+
+        return $this;
+    } // setWasNew()
+
+    /**
+     * Set the value of [was_in_promo] column.
+     *
+     * @param      int $v new value
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setWasInPromo($v)
+    {
+        if ($v !== null) {
+            $v = (int) $v;
+        }
+
+        if ($this->was_in_promo !== $v) {
+            $this->was_in_promo = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::WAS_IN_PROMO;
+        }
+
+
+        return $this;
+    } // setWasInPromo()
+
+    /**
+     * Set the value of [weight] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setWeight($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->weight !== $v) {
+            $this->weight = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::WEIGHT;
+        }
+
+
+        return $this;
+    } // setWeight()
+
+    /**
+     * Set the value of [tax] column.
+     *
+     * @param      double $v new value
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setTax($v)
+    {
+        if ($v !== null) {
+            $v = (double) $v;
+        }
+
+        if ($this->tax !== $v) {
+            $this->tax = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::TAX;
+        }
+
+
+        return $this;
+    } // setTax()
+
+    /**
+     * Set the value of [parent] column.
+     * not managed yet
+     * @param      int $v new value
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setParent($v)
+    {
+        if ($v !== null) {
+            $v = (int) $v;
+        }
+
+        if ($this->parent !== $v) {
+            $this->parent = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::PARENT;
+        }
+
+
+        return $this;
+    } // setParent()
+
+    /**
+     * Sets the value of [created_at] column to a normalized version of the date/time value specified.
+     *
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
+     *               Empty strings are treated as NULL.
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setCreatedAt($v)
+    {
+        $dt = PropelDateTime::newInstance($v, null, '\DateTime');
+        if ($this->created_at !== null || $dt !== null) {
+            if ($dt !== $this->created_at) {
+                $this->created_at = $dt;
+                $this->modifiedColumns[] = OrderProductTableMap::CREATED_AT;
+            }
+        } // if either are not null
+
+
+        return $this;
+    } // setCreatedAt()
+
+    /**
+     * Sets the value of [updated_at] column to a normalized version of the date/time value specified.
+     *
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
+     *               Empty strings are treated as NULL.
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setUpdatedAt($v)
+    {
+        $dt = PropelDateTime::newInstance($v, null, '\DateTime');
+        if ($this->updated_at !== null || $dt !== null) {
+            if ($dt !== $this->updated_at) {
+                $this->updated_at = $dt;
+                $this->modifiedColumns[] = OrderProductTableMap::UPDATED_AT;
+            }
+        } // if either are not null
+
+
+        return $this;
+    } // setUpdatedAt()
+
+    /**
+     * Indicates whether the columns in this object are only set to default values.
+     *
+     * This method can be used in conjunction with isModified() to indicate whether an object is both
+     * modified _and_ has some values set which are non-default.
+     *
+     * @return boolean Whether the columns in this object are only been set with default values.
+     */
+    public function hasOnlyDefaultValues()
+    {
+        // otherwise, everything was equal, so return TRUE
+        return true;
+    } // hasOnlyDefaultValues()
+
+    /**
+     * Hydrates (populates) the object variables with values from the database resultset.
+     *
+     * An offset (0-based "start column") is specified so that objects can be hydrated
+     * with a subset of the columns in the resultset rows.  This is needed, for example,
+     * for results of JOIN queries where the resultset row includes columns from two or
+     * more tables.
+     *
+     * @param array   $row       The row returned by DataFetcher->fetch().
+     * @param int     $startcol  0-based offset column which indicates which restultset column to start with.
+     * @param boolean $rehydrate Whether this object is being re-hydrated from the database.
+     * @param string  $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+                                  One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                            TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *
+     * @return int             next starting column
+     * @throws PropelException - Any caught Exception will be rewrapped as a PropelException.
+     */
+    public function hydrate($row, $startcol = 0, $rehydrate = false, $indexType = TableMap::TYPE_NUM)
+    {
+        try {
+
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : OrderProductTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->id = (null !== $col) ? (int) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : OrderProductTableMap::translateFieldName('OrderId', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->order_id = (null !== $col) ? (int) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : OrderProductTableMap::translateFieldName('ProductRef', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->product_ref = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : OrderProductTableMap::translateFieldName('ProductSaleElementsRef', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->product_sale_elements_ref = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : OrderProductTableMap::translateFieldName('Title', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->title = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : OrderProductTableMap::translateFieldName('Chapo', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->chapo = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : OrderProductTableMap::translateFieldName('Description', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->description = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : OrderProductTableMap::translateFieldName('Postscriptum', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->postscriptum = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : OrderProductTableMap::translateFieldName('Quantity', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->quantity = (null !== $col) ? (double) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : OrderProductTableMap::translateFieldName('Price', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->price = (null !== $col) ? (double) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : OrderProductTableMap::translateFieldName('PromoPrice', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->promo_price = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : OrderProductTableMap::translateFieldName('WasNew', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->was_new = (null !== $col) ? (int) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 12 + $startcol : OrderProductTableMap::translateFieldName('WasInPromo', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->was_in_promo = (null !== $col) ? (int) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : OrderProductTableMap::translateFieldName('Weight', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->weight = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : OrderProductTableMap::translateFieldName('Tax', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->tax = (null !== $col) ? (double) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 15 + $startcol : OrderProductTableMap::translateFieldName('Parent', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->parent = (null !== $col) ? (int) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 16 + $startcol : OrderProductTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            if ($col === '0000-00-00 00:00:00') {
+                $col = null;
+            }
+            $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 17 + $startcol : OrderProductTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            if ($col === '0000-00-00 00:00:00') {
+                $col = null;
+            }
+            $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
+            $this->resetModified();
+
+            $this->setNew(false);
+
+            if ($rehydrate) {
+                $this->ensureConsistency();
+            }
+
+            return $startcol + 18; // 18 = OrderProductTableMap::NUM_HYDRATE_COLUMNS.
+
+        } catch (Exception $e) {
+            throw new PropelException("Error populating \Thelia\Model\OrderProduct object", 0, $e);
+        }
+    }
+
+    /**
+     * Checks and repairs the internal consistency of the object.
+     *
+     * This method is executed after an already-instantiated object is re-hydrated
+     * from the database.  It exists to check any foreign keys to make sure that
+     * the objects related to the current object are correct based on foreign key.
+     *
+     * You can override this method in the stub class, but you should always invoke
+     * the base method from the overridden method (i.e. parent::ensureConsistency()),
+     * in case your model changes.
+     *
+     * @throws PropelException
+     */
+    public function ensureConsistency()
+    {
+        if ($this->aOrder !== null && $this->order_id !== $this->aOrder->getId()) {
+            $this->aOrder = null;
+        }
+    } // ensureConsistency
+
+    /**
+     * Reloads this object from datastore based on primary key and (optionally) resets all associated objects.
+     *
+     * This will only work if the object has been saved and has a valid primary key set.
+     *
+     * @param      boolean $deep (optional) Whether to also de-associated any related objects.
+     * @param      ConnectionInterface $con (optional) The ConnectionInterface connection to use.
+     * @return void
+     * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db
+     */
+    public function reload($deep = false, ConnectionInterface $con = null)
+    {
+        if ($this->isDeleted()) {
+            throw new PropelException("Cannot reload a deleted object.");
+        }
+
+        if ($this->isNew()) {
+            throw new PropelException("Cannot reload an unsaved object.");
+        }
+
+        if ($con === null) {
+            $con = Propel::getServiceContainer()->getReadConnection(OrderProductTableMap::DATABASE_NAME);
+        }
+
+        // We don't need to alter the object instance pool; we're just modifying this instance
+        // already in the pool.
+
+        $dataFetcher = ChildOrderProductQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con);
+        $row = $dataFetcher->fetch();
+        $dataFetcher->close();
+        if (!$row) {
+            throw new PropelException('Cannot find matching row in the database to reload object values.');
+        }
+        $this->hydrate($row, 0, true, $dataFetcher->getIndexType()); // rehydrate
+
+        if ($deep) {  // also de-associate any related objects?
+
+            $this->aOrder = null;
+            $this->collOrderAttributeCombinations = null;
+
+        } // if (deep)
+    }
+
+    /**
+     * Removes this object from datastore and sets delete attribute.
+     *
+     * @param      ConnectionInterface $con
+     * @return void
+     * @throws PropelException
+     * @see OrderProduct::setDeleted()
+     * @see OrderProduct::isDeleted()
+     */
+    public function delete(ConnectionInterface $con = null)
+    {
+        if ($this->isDeleted()) {
+            throw new PropelException("This object has already been deleted.");
+        }
+
+        if ($con === null) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductTableMap::DATABASE_NAME);
+        }
+
+        $con->beginTransaction();
+        try {
+            $deleteQuery = ChildOrderProductQuery::create()
+                ->filterByPrimaryKey($this->getPrimaryKey());
+            $ret = $this->preDelete($con);
+            if ($ret) {
+                $deleteQuery->delete($con);
+                $this->postDelete($con);
+                $con->commit();
+                $this->setDeleted(true);
+            } else {
+                $con->commit();
+            }
+        } catch (Exception $e) {
+            $con->rollBack();
+            throw $e;
+        }
+    }
+
+    /**
+     * Persists this object to the database.
+     *
+     * If the object is new, it inserts it; otherwise an update is performed.
+     * All modified related objects will also be persisted in the doSave()
+     * method.  This method wraps all precipitate database operations in a
+     * single transaction.
+     *
+     * @param      ConnectionInterface $con
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @throws PropelException
+     * @see doSave()
+     */
+    public function save(ConnectionInterface $con = null)
+    {
+        if ($this->isDeleted()) {
+            throw new PropelException("You cannot save an object that has been deleted.");
+        }
+
+        if ($con === null) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductTableMap::DATABASE_NAME);
+        }
+
+        $con->beginTransaction();
+        $isInsert = $this->isNew();
+        try {
+            $ret = $this->preSave($con);
+            if ($isInsert) {
+                $ret = $ret && $this->preInsert($con);
+                // timestampable behavior
+                if (!$this->isColumnModified(OrderProductTableMap::CREATED_AT)) {
+                    $this->setCreatedAt(time());
+                }
+                if (!$this->isColumnModified(OrderProductTableMap::UPDATED_AT)) {
+                    $this->setUpdatedAt(time());
+                }
+            } else {
+                $ret = $ret && $this->preUpdate($con);
+                // timestampable behavior
+                if ($this->isModified() && !$this->isColumnModified(OrderProductTableMap::UPDATED_AT)) {
+                    $this->setUpdatedAt(time());
+                }
+            }
+            if ($ret) {
+                $affectedRows = $this->doSave($con);
+                if ($isInsert) {
+                    $this->postInsert($con);
+                } else {
+                    $this->postUpdate($con);
+                }
+                $this->postSave($con);
+                OrderProductTableMap::addInstanceToPool($this);
+            } else {
+                $affectedRows = 0;
+            }
+            $con->commit();
+
+            return $affectedRows;
+        } catch (Exception $e) {
+            $con->rollBack();
+            throw $e;
+        }
+    }
+
+    /**
+     * Performs the work of inserting or updating the row in the database.
+     *
+     * If the object is new, it inserts it; otherwise an update is performed.
+     * All related objects are also updated in this method.
+     *
+     * @param      ConnectionInterface $con
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @throws PropelException
+     * @see save()
+     */
+    protected function doSave(ConnectionInterface $con)
+    {
+        $affectedRows = 0; // initialize var to track total num of affected rows
+        if (!$this->alreadyInSave) {
+            $this->alreadyInSave = true;
+
+            // We call the save method on the following object(s) if they
+            // were passed to this object by their corresponding set
+            // method.  This object relates to these object(s) by a
+            // foreign key reference.
+
+            if ($this->aOrder !== null) {
+                if ($this->aOrder->isModified() || $this->aOrder->isNew()) {
+                    $affectedRows += $this->aOrder->save($con);
+                }
+                $this->setOrder($this->aOrder);
+            }
+
+            if ($this->isNew() || $this->isModified()) {
+                // persist changes
+                if ($this->isNew()) {
+                    $this->doInsert($con);
+                } else {
+                    $this->doUpdate($con);
+                }
+                $affectedRows += 1;
+                $this->resetModified();
+            }
+
+            if ($this->orderAttributeCombinationsScheduledForDeletion !== null) {
+                if (!$this->orderAttributeCombinationsScheduledForDeletion->isEmpty()) {
+                    \Thelia\Model\OrderAttributeCombinationQuery::create()
+                        ->filterByPrimaryKeys($this->orderAttributeCombinationsScheduledForDeletion->getPrimaryKeys(false))
+                        ->delete($con);
+                    $this->orderAttributeCombinationsScheduledForDeletion = null;
+                }
+            }
+
+                if ($this->collOrderAttributeCombinations !== null) {
+            foreach ($this->collOrderAttributeCombinations as $referrerFK) {
+                    if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
+                        $affectedRows += $referrerFK->save($con);
+                    }
+                }
+            }
+
+            $this->alreadyInSave = false;
+
+        }
+
+        return $affectedRows;
+    } // doSave()
+
+    /**
+     * Insert the row in the database.
+     *
+     * @param      ConnectionInterface $con
+     *
+     * @throws PropelException
+     * @see doSave()
+     */
+    protected function doInsert(ConnectionInterface $con)
+    {
+        $modifiedColumns = array();
+        $index = 0;
+
+        $this->modifiedColumns[] = OrderProductTableMap::ID;
+        if (null !== $this->id) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key (' . OrderProductTableMap::ID . ')');
+        }
+
+         // check the columns in natural order for more readable SQL queries
+        if ($this->isColumnModified(OrderProductTableMap::ID)) {
+            $modifiedColumns[':p' . $index++]  = 'ID';
+        }
+        if ($this->isColumnModified(OrderProductTableMap::ORDER_ID)) {
+            $modifiedColumns[':p' . $index++]  = 'ORDER_ID';
+        }
+        if ($this->isColumnModified(OrderProductTableMap::PRODUCT_REF)) {
+            $modifiedColumns[':p' . $index++]  = 'PRODUCT_REF';
+        }
+        if ($this->isColumnModified(OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF)) {
+            $modifiedColumns[':p' . $index++]  = 'PRODUCT_SALE_ELEMENTS_REF';
+        }
+        if ($this->isColumnModified(OrderProductTableMap::TITLE)) {
+            $modifiedColumns[':p' . $index++]  = 'TITLE';
+        }
+        if ($this->isColumnModified(OrderProductTableMap::CHAPO)) {
+            $modifiedColumns[':p' . $index++]  = 'CHAPO';
+        }
+        if ($this->isColumnModified(OrderProductTableMap::DESCRIPTION)) {
+            $modifiedColumns[':p' . $index++]  = 'DESCRIPTION';
+        }
+        if ($this->isColumnModified(OrderProductTableMap::POSTSCRIPTUM)) {
+            $modifiedColumns[':p' . $index++]  = 'POSTSCRIPTUM';
+        }
+        if ($this->isColumnModified(OrderProductTableMap::QUANTITY)) {
+            $modifiedColumns[':p' . $index++]  = 'QUANTITY';
+        }
+        if ($this->isColumnModified(OrderProductTableMap::PRICE)) {
+            $modifiedColumns[':p' . $index++]  = 'PRICE';
+        }
+        if ($this->isColumnModified(OrderProductTableMap::PROMO_PRICE)) {
+            $modifiedColumns[':p' . $index++]  = 'PROMO_PRICE';
+        }
+        if ($this->isColumnModified(OrderProductTableMap::WAS_NEW)) {
+            $modifiedColumns[':p' . $index++]  = 'WAS_NEW';
+        }
+        if ($this->isColumnModified(OrderProductTableMap::WAS_IN_PROMO)) {
+            $modifiedColumns[':p' . $index++]  = 'WAS_IN_PROMO';
+        }
+        if ($this->isColumnModified(OrderProductTableMap::WEIGHT)) {
+            $modifiedColumns[':p' . $index++]  = 'WEIGHT';
+        }
+        if ($this->isColumnModified(OrderProductTableMap::TAX)) {
+            $modifiedColumns[':p' . $index++]  = 'TAX';
+        }
+        if ($this->isColumnModified(OrderProductTableMap::PARENT)) {
+            $modifiedColumns[':p' . $index++]  = 'PARENT';
+        }
+        if ($this->isColumnModified(OrderProductTableMap::CREATED_AT)) {
+            $modifiedColumns[':p' . $index++]  = 'CREATED_AT';
+        }
+        if ($this->isColumnModified(OrderProductTableMap::UPDATED_AT)) {
+            $modifiedColumns[':p' . $index++]  = 'UPDATED_AT';
+        }
+
+        $sql = sprintf(
+            'INSERT INTO order_product (%s) VALUES (%s)',
+            implode(', ', $modifiedColumns),
+            implode(', ', array_keys($modifiedColumns))
+        );
+
+        try {
+            $stmt = $con->prepare($sql);
+            foreach ($modifiedColumns as $identifier => $columnName) {
+                switch ($columnName) {
+                    case 'ID':
+                        $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
+                        break;
+                    case 'ORDER_ID':
+                        $stmt->bindValue($identifier, $this->order_id, PDO::PARAM_INT);
+                        break;
+                    case 'PRODUCT_REF':
+                        $stmt->bindValue($identifier, $this->product_ref, PDO::PARAM_STR);
+                        break;
+                    case 'PRODUCT_SALE_ELEMENTS_REF':
+                        $stmt->bindValue($identifier, $this->product_sale_elements_ref, PDO::PARAM_STR);
+                        break;
+                    case 'TITLE':
+                        $stmt->bindValue($identifier, $this->title, PDO::PARAM_STR);
+                        break;
+                    case 'CHAPO':
+                        $stmt->bindValue($identifier, $this->chapo, PDO::PARAM_STR);
+                        break;
+                    case 'DESCRIPTION':
+                        $stmt->bindValue($identifier, $this->description, PDO::PARAM_STR);
+                        break;
+                    case 'POSTSCRIPTUM':
+                        $stmt->bindValue($identifier, $this->postscriptum, PDO::PARAM_STR);
+                        break;
+                    case 'QUANTITY':
+                        $stmt->bindValue($identifier, $this->quantity, PDO::PARAM_STR);
+                        break;
+                    case 'PRICE':
+                        $stmt->bindValue($identifier, $this->price, PDO::PARAM_STR);
+                        break;
+                    case 'PROMO_PRICE':
+                        $stmt->bindValue($identifier, $this->promo_price, PDO::PARAM_STR);
+                        break;
+                    case 'WAS_NEW':
+                        $stmt->bindValue($identifier, $this->was_new, PDO::PARAM_INT);
+                        break;
+                    case 'WAS_IN_PROMO':
+                        $stmt->bindValue($identifier, $this->was_in_promo, PDO::PARAM_INT);
+                        break;
+                    case 'WEIGHT':
+                        $stmt->bindValue($identifier, $this->weight, PDO::PARAM_STR);
+                        break;
+                    case 'TAX':
+                        $stmt->bindValue($identifier, $this->tax, PDO::PARAM_STR);
+                        break;
+                    case 'PARENT':
+                        $stmt->bindValue($identifier, $this->parent, PDO::PARAM_INT);
+                        break;
+                    case 'CREATED_AT':
+                        $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
+                        break;
+                    case 'UPDATED_AT':
+                        $stmt->bindValue($identifier, $this->updated_at ? $this->updated_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
+                        break;
+                }
+            }
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e);
+        }
+
+        try {
+            $pk = $con->lastInsertId();
+        } catch (Exception $e) {
+            throw new PropelException('Unable to get autoincrement id.', 0, $e);
+        }
+        $this->setId($pk);
+
+        $this->setNew(false);
+    }
+
+    /**
+     * Update the row in the database.
+     *
+     * @param      ConnectionInterface $con
+     *
+     * @return Integer Number of updated rows
+     * @see doSave()
+     */
+    protected function doUpdate(ConnectionInterface $con)
+    {
+        $selectCriteria = $this->buildPkeyCriteria();
+        $valuesCriteria = $this->buildCriteria();
+
+        return $selectCriteria->doUpdate($valuesCriteria, $con);
+    }
+
+    /**
+     * Retrieves a field from the object by name passed in as a string.
+     *
+     * @param      string $name name
+     * @param      string $type The type of fieldname the $name is of:
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
+     * @return mixed Value of field.
+     */
+    public function getByName($name, $type = TableMap::TYPE_PHPNAME)
+    {
+        $pos = OrderProductTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
+        $field = $this->getByPosition($pos);
+
+        return $field;
+    }
+
+    /**
+     * Retrieves a field from the object by Position as specified in the xml schema.
+     * Zero-based.
+     *
+     * @param      int $pos position in xml schema
+     * @return mixed Value of field at $pos
+     */
+    public function getByPosition($pos)
+    {
+        switch ($pos) {
+            case 0:
+                return $this->getId();
+                break;
+            case 1:
+                return $this->getOrderId();
+                break;
+            case 2:
+                return $this->getProductRef();
+                break;
+            case 3:
+                return $this->getProductSaleElementsRef();
+                break;
+            case 4:
+                return $this->getTitle();
+                break;
+            case 5:
+                return $this->getChapo();
+                break;
+            case 6:
+                return $this->getDescription();
+                break;
+            case 7:
+                return $this->getPostscriptum();
+                break;
+            case 8:
+                return $this->getQuantity();
+                break;
+            case 9:
+                return $this->getPrice();
+                break;
+            case 10:
+                return $this->getPromoPrice();
+                break;
+            case 11:
+                return $this->getWasNew();
+                break;
+            case 12:
+                return $this->getWasInPromo();
+                break;
+            case 13:
+                return $this->getWeight();
+                break;
+            case 14:
+                return $this->getTax();
+                break;
+            case 15:
+                return $this->getParent();
+                break;
+            case 16:
+                return $this->getCreatedAt();
+                break;
+            case 17:
+                return $this->getUpdatedAt();
+                break;
+            default:
+                return null;
+                break;
+        } // switch()
+    }
+
+    /**
+     * Exports the object as an array.
+     *
+     * You can specify the key type of the array by passing one of the class
+     * type constants.
+     *
+     * @param     string  $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+     *                    TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                    Defaults to TableMap::TYPE_PHPNAME.
+     * @param     boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
+     * @param     array $alreadyDumpedObjects List of objects to skip to avoid recursion
+     * @param     boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE.
+     *
+     * @return array an associative array containing the field names (as keys) and field values
+     */
+    public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false)
+    {
+        if (isset($alreadyDumpedObjects['OrderProduct'][$this->getPrimaryKey()])) {
+            return '*RECURSION*';
+        }
+        $alreadyDumpedObjects['OrderProduct'][$this->getPrimaryKey()] = true;
+        $keys = OrderProductTableMap::getFieldNames($keyType);
+        $result = array(
+            $keys[0] => $this->getId(),
+            $keys[1] => $this->getOrderId(),
+            $keys[2] => $this->getProductRef(),
+            $keys[3] => $this->getProductSaleElementsRef(),
+            $keys[4] => $this->getTitle(),
+            $keys[5] => $this->getChapo(),
+            $keys[6] => $this->getDescription(),
+            $keys[7] => $this->getPostscriptum(),
+            $keys[8] => $this->getQuantity(),
+            $keys[9] => $this->getPrice(),
+            $keys[10] => $this->getPromoPrice(),
+            $keys[11] => $this->getWasNew(),
+            $keys[12] => $this->getWasInPromo(),
+            $keys[13] => $this->getWeight(),
+            $keys[14] => $this->getTax(),
+            $keys[15] => $this->getParent(),
+            $keys[16] => $this->getCreatedAt(),
+            $keys[17] => $this->getUpdatedAt(),
+        );
+        $virtualColumns = $this->virtualColumns;
+        foreach($virtualColumns as $key => $virtualColumn)
+        {
+            $result[$key] = $virtualColumn;
+        }
+
+        if ($includeForeignObjects) {
+            if (null !== $this->aOrder) {
+                $result['Order'] = $this->aOrder->toArray($keyType, $includeLazyLoadColumns,  $alreadyDumpedObjects, true);
+            }
+            if (null !== $this->collOrderAttributeCombinations) {
+                $result['OrderAttributeCombinations'] = $this->collOrderAttributeCombinations->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Sets a field from the object by name passed in as a string.
+     *
+     * @param      string $name
+     * @param      mixed  $value field value
+     * @param      string $type The type of fieldname the $name is of:
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
+     * @return void
+     */
+    public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
+    {
+        $pos = OrderProductTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
+
+        return $this->setByPosition($pos, $value);
+    }
+
+    /**
+     * Sets a field from the object by Position as specified in the xml schema.
+     * Zero-based.
+     *
+     * @param      int $pos position in xml schema
+     * @param      mixed $value field value
+     * @return void
+     */
+    public function setByPosition($pos, $value)
+    {
+        switch ($pos) {
+            case 0:
+                $this->setId($value);
+                break;
+            case 1:
+                $this->setOrderId($value);
+                break;
+            case 2:
+                $this->setProductRef($value);
+                break;
+            case 3:
+                $this->setProductSaleElementsRef($value);
+                break;
+            case 4:
+                $this->setTitle($value);
+                break;
+            case 5:
+                $this->setChapo($value);
+                break;
+            case 6:
+                $this->setDescription($value);
+                break;
+            case 7:
+                $this->setPostscriptum($value);
+                break;
+            case 8:
+                $this->setQuantity($value);
+                break;
+            case 9:
+                $this->setPrice($value);
+                break;
+            case 10:
+                $this->setPromoPrice($value);
+                break;
+            case 11:
+                $this->setWasNew($value);
+                break;
+            case 12:
+                $this->setWasInPromo($value);
+                break;
+            case 13:
+                $this->setWeight($value);
+                break;
+            case 14:
+                $this->setTax($value);
+                break;
+            case 15:
+                $this->setParent($value);
+                break;
+            case 16:
+                $this->setCreatedAt($value);
+                break;
+            case 17:
+                $this->setUpdatedAt($value);
+                break;
+        } // switch()
+    }
+
+    /**
+     * Populates the object using an array.
+     *
+     * This is particularly useful when populating an object from one of the
+     * request arrays (e.g. $_POST).  This method goes through the column
+     * names, checking to see whether a matching key exists in populated
+     * array. If so the setByName() method is called for that column.
+     *
+     * You can specify the key type of the array by additionally passing one
+     * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+     * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     * The default key type is the column's TableMap::TYPE_PHPNAME.
+     *
+     * @param      array  $arr     An array to populate the object from.
+     * @param      string $keyType The type of keys the array uses.
+     * @return void
+     */
+    public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
+    {
+        $keys = OrderProductTableMap::getFieldNames($keyType);
+
+        if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
+        if (array_key_exists($keys[1], $arr)) $this->setOrderId($arr[$keys[1]]);
+        if (array_key_exists($keys[2], $arr)) $this->setProductRef($arr[$keys[2]]);
+        if (array_key_exists($keys[3], $arr)) $this->setProductSaleElementsRef($arr[$keys[3]]);
+        if (array_key_exists($keys[4], $arr)) $this->setTitle($arr[$keys[4]]);
+        if (array_key_exists($keys[5], $arr)) $this->setChapo($arr[$keys[5]]);
+        if (array_key_exists($keys[6], $arr)) $this->setDescription($arr[$keys[6]]);
+        if (array_key_exists($keys[7], $arr)) $this->setPostscriptum($arr[$keys[7]]);
+        if (array_key_exists($keys[8], $arr)) $this->setQuantity($arr[$keys[8]]);
+        if (array_key_exists($keys[9], $arr)) $this->setPrice($arr[$keys[9]]);
+        if (array_key_exists($keys[10], $arr)) $this->setPromoPrice($arr[$keys[10]]);
+        if (array_key_exists($keys[11], $arr)) $this->setWasNew($arr[$keys[11]]);
+        if (array_key_exists($keys[12], $arr)) $this->setWasInPromo($arr[$keys[12]]);
+        if (array_key_exists($keys[13], $arr)) $this->setWeight($arr[$keys[13]]);
+        if (array_key_exists($keys[14], $arr)) $this->setTax($arr[$keys[14]]);
+        if (array_key_exists($keys[15], $arr)) $this->setParent($arr[$keys[15]]);
+        if (array_key_exists($keys[16], $arr)) $this->setCreatedAt($arr[$keys[16]]);
+        if (array_key_exists($keys[17], $arr)) $this->setUpdatedAt($arr[$keys[17]]);
+    }
+
+    /**
+     * Build a Criteria object containing the values of all modified columns in this object.
+     *
+     * @return Criteria The Criteria object containing all modified values.
+     */
+    public function buildCriteria()
+    {
+        $criteria = new Criteria(OrderProductTableMap::DATABASE_NAME);
+
+        if ($this->isColumnModified(OrderProductTableMap::ID)) $criteria->add(OrderProductTableMap::ID, $this->id);
+        if ($this->isColumnModified(OrderProductTableMap::ORDER_ID)) $criteria->add(OrderProductTableMap::ORDER_ID, $this->order_id);
+        if ($this->isColumnModified(OrderProductTableMap::PRODUCT_REF)) $criteria->add(OrderProductTableMap::PRODUCT_REF, $this->product_ref);
+        if ($this->isColumnModified(OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF)) $criteria->add(OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF, $this->product_sale_elements_ref);
+        if ($this->isColumnModified(OrderProductTableMap::TITLE)) $criteria->add(OrderProductTableMap::TITLE, $this->title);
+        if ($this->isColumnModified(OrderProductTableMap::CHAPO)) $criteria->add(OrderProductTableMap::CHAPO, $this->chapo);
+        if ($this->isColumnModified(OrderProductTableMap::DESCRIPTION)) $criteria->add(OrderProductTableMap::DESCRIPTION, $this->description);
+        if ($this->isColumnModified(OrderProductTableMap::POSTSCRIPTUM)) $criteria->add(OrderProductTableMap::POSTSCRIPTUM, $this->postscriptum);
+        if ($this->isColumnModified(OrderProductTableMap::QUANTITY)) $criteria->add(OrderProductTableMap::QUANTITY, $this->quantity);
+        if ($this->isColumnModified(OrderProductTableMap::PRICE)) $criteria->add(OrderProductTableMap::PRICE, $this->price);
+        if ($this->isColumnModified(OrderProductTableMap::PROMO_PRICE)) $criteria->add(OrderProductTableMap::PROMO_PRICE, $this->promo_price);
+        if ($this->isColumnModified(OrderProductTableMap::WAS_NEW)) $criteria->add(OrderProductTableMap::WAS_NEW, $this->was_new);
+        if ($this->isColumnModified(OrderProductTableMap::WAS_IN_PROMO)) $criteria->add(OrderProductTableMap::WAS_IN_PROMO, $this->was_in_promo);
+        if ($this->isColumnModified(OrderProductTableMap::WEIGHT)) $criteria->add(OrderProductTableMap::WEIGHT, $this->weight);
+        if ($this->isColumnModified(OrderProductTableMap::TAX)) $criteria->add(OrderProductTableMap::TAX, $this->tax);
+        if ($this->isColumnModified(OrderProductTableMap::PARENT)) $criteria->add(OrderProductTableMap::PARENT, $this->parent);
+        if ($this->isColumnModified(OrderProductTableMap::CREATED_AT)) $criteria->add(OrderProductTableMap::CREATED_AT, $this->created_at);
+        if ($this->isColumnModified(OrderProductTableMap::UPDATED_AT)) $criteria->add(OrderProductTableMap::UPDATED_AT, $this->updated_at);
+
+        return $criteria;
+    }
+
+    /**
+     * Builds a Criteria object containing the primary key for this object.
+     *
+     * Unlike buildCriteria() this method includes the primary key values regardless
+     * of whether or not they have been modified.
+     *
+     * @return Criteria The Criteria object containing value(s) for primary key(s).
+     */
+    public function buildPkeyCriteria()
+    {
+        $criteria = new Criteria(OrderProductTableMap::DATABASE_NAME);
+        $criteria->add(OrderProductTableMap::ID, $this->id);
+
+        return $criteria;
+    }
+
+    /**
+     * Returns the primary key for this object (row).
+     * @return   int
+     */
+    public function getPrimaryKey()
+    {
+        return $this->getId();
+    }
+
+    /**
+     * Generic method to set the primary key (id column).
+     *
+     * @param       int $key Primary key.
+     * @return void
+     */
+    public function setPrimaryKey($key)
+    {
+        $this->setId($key);
+    }
+
+    /**
+     * Returns true if the primary key for this object is null.
+     * @return boolean
+     */
+    public function isPrimaryKeyNull()
+    {
+
+        return null === $this->getId();
+    }
+
+    /**
+     * Sets contents of passed object to values from current object.
+     *
+     * If desired, this method can also make copies of all associated (fkey referrers)
+     * objects.
+     *
+     * @param      object $copyObj An object of \Thelia\Model\OrderProduct (or compatible) type.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $makeNew Whether to reset autoincrement PKs and make the object new.
+     * @throws PropelException
+     */
+    public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
+    {
+        $copyObj->setOrderId($this->getOrderId());
+        $copyObj->setProductRef($this->getProductRef());
+        $copyObj->setProductSaleElementsRef($this->getProductSaleElementsRef());
+        $copyObj->setTitle($this->getTitle());
+        $copyObj->setChapo($this->getChapo());
+        $copyObj->setDescription($this->getDescription());
+        $copyObj->setPostscriptum($this->getPostscriptum());
+        $copyObj->setQuantity($this->getQuantity());
+        $copyObj->setPrice($this->getPrice());
+        $copyObj->setPromoPrice($this->getPromoPrice());
+        $copyObj->setWasNew($this->getWasNew());
+        $copyObj->setWasInPromo($this->getWasInPromo());
+        $copyObj->setWeight($this->getWeight());
+        $copyObj->setTax($this->getTax());
+        $copyObj->setParent($this->getParent());
+        $copyObj->setCreatedAt($this->getCreatedAt());
+        $copyObj->setUpdatedAt($this->getUpdatedAt());
+
+        if ($deepCopy) {
+            // important: temporarily setNew(false) because this affects the behavior of
+            // the getter/setter methods for fkey referrer objects.
+            $copyObj->setNew(false);
+
+            foreach ($this->getOrderAttributeCombinations() as $relObj) {
+                if ($relObj !== $this) {  // ensure that we don't try to copy a reference to ourselves
+                    $copyObj->addOrderAttributeCombination($relObj->copy($deepCopy));
+                }
+            }
+
+        } // if ($deepCopy)
+
+        if ($makeNew) {
+            $copyObj->setNew(true);
+            $copyObj->setId(NULL); // this is a auto-increment column, so set to default value
+        }
+    }
+
+    /**
+     * Makes a copy of this object that will be inserted as a new row in table when saved.
+     * It creates a new object filling in the simple attributes, but skipping any primary
+     * keys that are defined for the table.
+     *
+     * If desired, this method can also make copies of all associated (fkey referrers)
+     * objects.
+     *
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @return                 \Thelia\Model\OrderProduct Clone of current object.
+     * @throws PropelException
+     */
+    public function copy($deepCopy = false)
+    {
+        // we use get_class(), because this might be a subclass
+        $clazz = get_class($this);
+        $copyObj = new $clazz();
+        $this->copyInto($copyObj, $deepCopy);
+
+        return $copyObj;
+    }
+
+    /**
+     * Declares an association between this object and a ChildOrder object.
+     *
+     * @param                  ChildOrder $v
+     * @return                 \Thelia\Model\OrderProduct The current object (for fluent API support)
+     * @throws PropelException
+     */
+    public function setOrder(ChildOrder $v = null)
+    {
+        if ($v === null) {
+            $this->setOrderId(NULL);
+        } else {
+            $this->setOrderId($v->getId());
+        }
+
+        $this->aOrder = $v;
+
+        // Add binding for other direction of this n:n relationship.
+        // If this object has already been added to the ChildOrder object, it will not be re-added.
+        if ($v !== null) {
+            $v->addOrderProduct($this);
+        }
+
+
+        return $this;
+    }
+
+
+    /**
+     * Get the associated ChildOrder object
+     *
+     * @param      ConnectionInterface $con Optional Connection object.
+     * @return                 ChildOrder The associated ChildOrder object.
+     * @throws PropelException
+     */
+    public function getOrder(ConnectionInterface $con = null)
+    {
+        if ($this->aOrder === null && ($this->order_id !== null)) {
+            $this->aOrder = ChildOrderQuery::create()->findPk($this->order_id, $con);
+            /* The following can be used additionally to
+                guarantee the related object contains a reference
+                to this object.  This level of coupling may, however, be
+                undesirable since it could result in an only partially populated collection
+                in the referenced object.
+                $this->aOrder->addOrderProducts($this);
+             */
+        }
+
+        return $this->aOrder;
+    }
+
+
+    /**
+     * Initializes a collection based on the name of a relation.
+     * Avoids crafting an 'init[$relationName]s' method name
+     * that wouldn't work when StandardEnglishPluralizer is used.
+     *
+     * @param      string $relationName The name of the relation to initialize
+     * @return void
+     */
+    public function initRelation($relationName)
+    {
+        if ('OrderAttributeCombination' == $relationName) {
+            return $this->initOrderAttributeCombinations();
+        }
+    }
+
+    /**
+     * Clears out the collOrderAttributeCombinations collection
+     *
+     * This does not modify the database; however, it will remove any associated objects, causing
+     * them to be refetched by subsequent calls to accessor method.
+     *
+     * @return void
+     * @see        addOrderAttributeCombinations()
+     */
+    public function clearOrderAttributeCombinations()
+    {
+        $this->collOrderAttributeCombinations = null; // important to set this to NULL since that means it is uninitialized
+    }
+
+    /**
+     * Reset is the collOrderAttributeCombinations collection loaded partially.
+     */
+    public function resetPartialOrderAttributeCombinations($v = true)
+    {
+        $this->collOrderAttributeCombinationsPartial = $v;
+    }
+
+    /**
+     * Initializes the collOrderAttributeCombinations collection.
+     *
+     * By default this just sets the collOrderAttributeCombinations collection to an empty array (like clearcollOrderAttributeCombinations());
+     * however, you may wish to override this method in your stub class to provide setting appropriate
+     * to your application -- for example, setting the initial array to the values stored in database.
+     *
+     * @param      boolean $overrideExisting If set to true, the method call initializes
+     *                                        the collection even if it is not empty
+     *
+     * @return void
+     */
+    public function initOrderAttributeCombinations($overrideExisting = true)
+    {
+        if (null !== $this->collOrderAttributeCombinations && !$overrideExisting) {
+            return;
+        }
+        $this->collOrderAttributeCombinations = new ObjectCollection();
+        $this->collOrderAttributeCombinations->setModel('\Thelia\Model\OrderAttributeCombination');
+    }
+
+    /**
+     * Gets an array of ChildOrderAttributeCombination objects which contain a foreign key that references this object.
+     *
+     * If the $criteria is not null, it is used to always fetch the results from the database.
+     * Otherwise the results are fetched from the database the first time, then cached.
+     * Next time the same method is called without $criteria, the cached collection is returned.
+     * If this ChildOrderProduct is new, it will return
+     * an empty collection or the current collection; the criteria is ignored on a new object.
+     *
+     * @param      Criteria $criteria optional Criteria object to narrow the query
+     * @param      ConnectionInterface $con optional connection object
+     * @return Collection|ChildOrderAttributeCombination[] List of ChildOrderAttributeCombination objects
+     * @throws PropelException
+     */
+    public function getOrderAttributeCombinations($criteria = null, ConnectionInterface $con = null)
+    {
+        $partial = $this->collOrderAttributeCombinationsPartial && !$this->isNew();
+        if (null === $this->collOrderAttributeCombinations || null !== $criteria  || $partial) {
+            if ($this->isNew() && null === $this->collOrderAttributeCombinations) {
+                // return empty collection
+                $this->initOrderAttributeCombinations();
+            } else {
+                $collOrderAttributeCombinations = ChildOrderAttributeCombinationQuery::create(null, $criteria)
+                    ->filterByOrderProduct($this)
+                    ->find($con);
+
+                if (null !== $criteria) {
+                    if (false !== $this->collOrderAttributeCombinationsPartial && count($collOrderAttributeCombinations)) {
+                        $this->initOrderAttributeCombinations(false);
+
+                        foreach ($collOrderAttributeCombinations as $obj) {
+                            if (false == $this->collOrderAttributeCombinations->contains($obj)) {
+                                $this->collOrderAttributeCombinations->append($obj);
+                            }
+                        }
+
+                        $this->collOrderAttributeCombinationsPartial = true;
+                    }
+
+                    $collOrderAttributeCombinations->getInternalIterator()->rewind();
+
+                    return $collOrderAttributeCombinations;
+                }
+
+                if ($partial && $this->collOrderAttributeCombinations) {
+                    foreach ($this->collOrderAttributeCombinations as $obj) {
+                        if ($obj->isNew()) {
+                            $collOrderAttributeCombinations[] = $obj;
+                        }
+                    }
+                }
+
+                $this->collOrderAttributeCombinations = $collOrderAttributeCombinations;
+                $this->collOrderAttributeCombinationsPartial = false;
+            }
+        }
+
+        return $this->collOrderAttributeCombinations;
+    }
+
+    /**
+     * Sets a collection of OrderAttributeCombination objects related by a one-to-many relationship
+     * to the current object.
+     * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+     * and new objects from the given Propel collection.
+     *
+     * @param      Collection $orderAttributeCombinations A Propel collection.
+     * @param      ConnectionInterface $con Optional connection object
+     * @return   ChildOrderProduct The current object (for fluent API support)
+     */
+    public function setOrderAttributeCombinations(Collection $orderAttributeCombinations, ConnectionInterface $con = null)
+    {
+        $orderAttributeCombinationsToDelete = $this->getOrderAttributeCombinations(new Criteria(), $con)->diff($orderAttributeCombinations);
+
+
+        $this->orderAttributeCombinationsScheduledForDeletion = $orderAttributeCombinationsToDelete;
+
+        foreach ($orderAttributeCombinationsToDelete as $orderAttributeCombinationRemoved) {
+            $orderAttributeCombinationRemoved->setOrderProduct(null);
+        }
+
+        $this->collOrderAttributeCombinations = null;
+        foreach ($orderAttributeCombinations as $orderAttributeCombination) {
+            $this->addOrderAttributeCombination($orderAttributeCombination);
+        }
+
+        $this->collOrderAttributeCombinations = $orderAttributeCombinations;
+        $this->collOrderAttributeCombinationsPartial = false;
+
+        return $this;
+    }
+
+    /**
+     * Returns the number of related OrderAttributeCombination objects.
+     *
+     * @param      Criteria $criteria
+     * @param      boolean $distinct
+     * @param      ConnectionInterface $con
+     * @return int             Count of related OrderAttributeCombination objects.
+     * @throws PropelException
+     */
+    public function countOrderAttributeCombinations(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
+    {
+        $partial = $this->collOrderAttributeCombinationsPartial && !$this->isNew();
+        if (null === $this->collOrderAttributeCombinations || null !== $criteria || $partial) {
+            if ($this->isNew() && null === $this->collOrderAttributeCombinations) {
+                return 0;
+            }
+
+            if ($partial && !$criteria) {
+                return count($this->getOrderAttributeCombinations());
+            }
+
+            $query = ChildOrderAttributeCombinationQuery::create(null, $criteria);
+            if ($distinct) {
+                $query->distinct();
+            }
+
+            return $query
+                ->filterByOrderProduct($this)
+                ->count($con);
+        }
+
+        return count($this->collOrderAttributeCombinations);
+    }
+
+    /**
+     * Method called to associate a ChildOrderAttributeCombination object to this object
+     * through the ChildOrderAttributeCombination foreign key attribute.
+     *
+     * @param    ChildOrderAttributeCombination $l ChildOrderAttributeCombination
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function addOrderAttributeCombination(ChildOrderAttributeCombination $l)
+    {
+        if ($this->collOrderAttributeCombinations === null) {
+            $this->initOrderAttributeCombinations();
+            $this->collOrderAttributeCombinationsPartial = true;
+        }
+
+        if (!in_array($l, $this->collOrderAttributeCombinations->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
+            $this->doAddOrderAttributeCombination($l);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param OrderAttributeCombination $orderAttributeCombination The orderAttributeCombination object to add.
+     */
+    protected function doAddOrderAttributeCombination($orderAttributeCombination)
+    {
+        $this->collOrderAttributeCombinations[]= $orderAttributeCombination;
+        $orderAttributeCombination->setOrderProduct($this);
+    }
+
+    /**
+     * @param  OrderAttributeCombination $orderAttributeCombination The orderAttributeCombination object to remove.
+     * @return ChildOrderProduct The current object (for fluent API support)
+     */
+    public function removeOrderAttributeCombination($orderAttributeCombination)
+    {
+        if ($this->getOrderAttributeCombinations()->contains($orderAttributeCombination)) {
+            $this->collOrderAttributeCombinations->remove($this->collOrderAttributeCombinations->search($orderAttributeCombination));
+            if (null === $this->orderAttributeCombinationsScheduledForDeletion) {
+                $this->orderAttributeCombinationsScheduledForDeletion = clone $this->collOrderAttributeCombinations;
+                $this->orderAttributeCombinationsScheduledForDeletion->clear();
+            }
+            $this->orderAttributeCombinationsScheduledForDeletion[]= clone $orderAttributeCombination;
+            $orderAttributeCombination->setOrderProduct(null);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Clears the current object and sets all attributes to their default values
+     */
+    public function clear()
+    {
+        $this->id = null;
+        $this->order_id = null;
+        $this->product_ref = null;
+        $this->product_sale_elements_ref = null;
+        $this->title = null;
+        $this->chapo = null;
+        $this->description = null;
+        $this->postscriptum = null;
+        $this->quantity = null;
+        $this->price = null;
+        $this->promo_price = null;
+        $this->was_new = null;
+        $this->was_in_promo = null;
+        $this->weight = null;
+        $this->tax = null;
+        $this->parent = null;
+        $this->created_at = null;
+        $this->updated_at = null;
+        $this->alreadyInSave = false;
+        $this->clearAllReferences();
+        $this->resetModified();
+        $this->setNew(true);
+        $this->setDeleted(false);
+    }
+
+    /**
+     * Resets all references to other model objects or collections of model objects.
+     *
+     * This method is a user-space workaround for PHP's inability to garbage collect
+     * objects with circular references (even in PHP 5.3). This is currently necessary
+     * when using Propel in certain daemon or large-volume/high-memory operations.
+     *
+     * @param      boolean $deep Whether to also clear the references on all referrer objects.
+     */
+    public function clearAllReferences($deep = false)
+    {
+        if ($deep) {
+            if ($this->collOrderAttributeCombinations) {
+                foreach ($this->collOrderAttributeCombinations as $o) {
+                    $o->clearAllReferences($deep);
+                }
+            }
+        } // if ($deep)
+
+        if ($this->collOrderAttributeCombinations instanceof Collection) {
+            $this->collOrderAttributeCombinations->clearIterator();
+        }
+        $this->collOrderAttributeCombinations = null;
+        $this->aOrder = null;
+    }
+
+    /**
+     * Return the string representation of this object
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return (string) $this->exportTo(OrderProductTableMap::DEFAULT_STRING_FORMAT);
+    }
+
+    // timestampable behavior
+
+    /**
+     * Mark the current object so that the update date doesn't get updated during next save
+     *
+     * @return     ChildOrderProduct The current object (for fluent API support)
+     */
+    public function keepUpdateDateUnchanged()
+    {
+        $this->modifiedColumns[] = OrderProductTableMap::UPDATED_AT;
+
+        return $this;
+    }
+
+    /**
+     * Code to be run before persisting the object
+     * @param  ConnectionInterface $con
+     * @return boolean
+     */
+    public function preSave(ConnectionInterface $con = null)
+    {
+        return true;
+    }
+
+    /**
+     * Code to be run after persisting the object
+     * @param ConnectionInterface $con
+     */
+    public function postSave(ConnectionInterface $con = null)
+    {
+
+    }
+
+    /**
+     * Code to be run before inserting to database
+     * @param  ConnectionInterface $con
+     * @return boolean
+     */
+    public function preInsert(ConnectionInterface $con = null)
+    {
+        return true;
+    }
+
+    /**
+     * Code to be run after inserting to database
+     * @param ConnectionInterface $con
+     */
+    public function postInsert(ConnectionInterface $con = null)
+    {
+
+    }
+
+    /**
+     * Code to be run before updating the object in database
+     * @param  ConnectionInterface $con
+     * @return boolean
+     */
+    public function preUpdate(ConnectionInterface $con = null)
+    {
+        return true;
+    }
+
+    /**
+     * Code to be run after updating the object in database
+     * @param ConnectionInterface $con
+     */
+    public function postUpdate(ConnectionInterface $con = null)
+    {
+
+    }
+
+    /**
+     * Code to be run before deleting the object in database
+     * @param  ConnectionInterface $con
+     * @return boolean
+     */
+    public function preDelete(ConnectionInterface $con = null)
+    {
+        return true;
+    }
+
+    /**
+     * Code to be run after deleting the object in database
+     * @param ConnectionInterface $con
+     */
+    public function postDelete(ConnectionInterface $con = null)
+    {
+
+    }
+
+
+    /**
+     * Derived method to catches calls to undefined methods.
+     *
+     * Provides magic import/export method support (fromXML()/toXML(), fromYAML()/toYAML(), etc.).
+     * Allows to define default __call() behavior if you overwrite __call()
+     *
+     * @param string $name
+     * @param mixed  $params
+     *
+     * @return array|string
+     */
+    public function __call($name, $params)
+    {
+        if (0 === strpos($name, 'get')) {
+            $virtualColumn = substr($name, 3);
+            if ($this->hasVirtualColumn($virtualColumn)) {
+                return $this->getVirtualColumn($virtualColumn);
+            }
+
+            $virtualColumn = lcfirst($virtualColumn);
+            if ($this->hasVirtualColumn($virtualColumn)) {
+                return $this->getVirtualColumn($virtualColumn);
+            }
+        }
+
+        if (0 === strpos($name, 'from')) {
+            $format = substr($name, 4);
+
+            return $this->importFrom($format, reset($params));
+        }
+
+        if (0 === strpos($name, 'to')) {
+            $format = substr($name, 2);
+            $includeLazyLoadColumns = isset($params[0]) ? $params[0] : true;
+
+            return $this->exportTo($format, $includeLazyLoadColumns);
+        }
+
+        throw new BadMethodCallException(sprintf('Call to undefined method: %s.', $name));
+    }
+
+}
diff --git a/core/lib/Thelia/Model/Base/OrderProductQuery.php b/core/lib/Thelia/Model/Base/OrderProductQuery.php
new file mode 100644
index 000000000..b471fc359
--- /dev/null
+++ b/core/lib/Thelia/Model/Base/OrderProductQuery.php
@@ -0,0 +1,1244 @@
+<?php
+
+namespace Thelia\Model\Base;
+
+use \Exception;
+use \PDO;
+use Propel\Runtime\Propel;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
+use Propel\Runtime\ActiveQuery\ModelJoin;
+use Propel\Runtime\Collection\Collection;
+use Propel\Runtime\Collection\ObjectCollection;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Exception\PropelException;
+use Thelia\Model\OrderProduct as ChildOrderProduct;
+use Thelia\Model\OrderProductQuery as ChildOrderProductQuery;
+use Thelia\Model\Map\OrderProductTableMap;
+
+/**
+ * Base class that represents a query for the 'order_product' table.
+ *
+ *
+ *
+ * @method     ChildOrderProductQuery orderById($order = Criteria::ASC) Order by the id column
+ * @method     ChildOrderProductQuery orderByOrderId($order = Criteria::ASC) Order by the order_id column
+ * @method     ChildOrderProductQuery orderByProductRef($order = Criteria::ASC) Order by the product_ref column
+ * @method     ChildOrderProductQuery orderByProductSaleElementsRef($order = Criteria::ASC) Order by the product_sale_elements_ref column
+ * @method     ChildOrderProductQuery orderByTitle($order = Criteria::ASC) Order by the title column
+ * @method     ChildOrderProductQuery orderByChapo($order = Criteria::ASC) Order by the chapo column
+ * @method     ChildOrderProductQuery orderByDescription($order = Criteria::ASC) Order by the description column
+ * @method     ChildOrderProductQuery orderByPostscriptum($order = Criteria::ASC) Order by the postscriptum column
+ * @method     ChildOrderProductQuery orderByQuantity($order = Criteria::ASC) Order by the quantity column
+ * @method     ChildOrderProductQuery orderByPrice($order = Criteria::ASC) Order by the price column
+ * @method     ChildOrderProductQuery orderByPromoPrice($order = Criteria::ASC) Order by the promo_price column
+ * @method     ChildOrderProductQuery orderByWasNew($order = Criteria::ASC) Order by the was_new column
+ * @method     ChildOrderProductQuery orderByWasInPromo($order = Criteria::ASC) Order by the was_in_promo column
+ * @method     ChildOrderProductQuery orderByWeight($order = Criteria::ASC) Order by the weight column
+ * @method     ChildOrderProductQuery orderByTax($order = Criteria::ASC) Order by the tax column
+ * @method     ChildOrderProductQuery orderByParent($order = Criteria::ASC) Order by the parent column
+ * @method     ChildOrderProductQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
+ * @method     ChildOrderProductQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
+ *
+ * @method     ChildOrderProductQuery groupById() Group by the id column
+ * @method     ChildOrderProductQuery groupByOrderId() Group by the order_id column
+ * @method     ChildOrderProductQuery groupByProductRef() Group by the product_ref column
+ * @method     ChildOrderProductQuery groupByProductSaleElementsRef() Group by the product_sale_elements_ref column
+ * @method     ChildOrderProductQuery groupByTitle() Group by the title column
+ * @method     ChildOrderProductQuery groupByChapo() Group by the chapo column
+ * @method     ChildOrderProductQuery groupByDescription() Group by the description column
+ * @method     ChildOrderProductQuery groupByPostscriptum() Group by the postscriptum column
+ * @method     ChildOrderProductQuery groupByQuantity() Group by the quantity column
+ * @method     ChildOrderProductQuery groupByPrice() Group by the price column
+ * @method     ChildOrderProductQuery groupByPromoPrice() Group by the promo_price column
+ * @method     ChildOrderProductQuery groupByWasNew() Group by the was_new column
+ * @method     ChildOrderProductQuery groupByWasInPromo() Group by the was_in_promo column
+ * @method     ChildOrderProductQuery groupByWeight() Group by the weight column
+ * @method     ChildOrderProductQuery groupByTax() Group by the tax column
+ * @method     ChildOrderProductQuery groupByParent() Group by the parent column
+ * @method     ChildOrderProductQuery groupByCreatedAt() Group by the created_at column
+ * @method     ChildOrderProductQuery groupByUpdatedAt() Group by the updated_at column
+ *
+ * @method     ChildOrderProductQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
+ * @method     ChildOrderProductQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
+ * @method     ChildOrderProductQuery innerJoin($relation) Adds a INNER JOIN clause to the query
+ *
+ * @method     ChildOrderProductQuery leftJoinOrder($relationAlias = null) Adds a LEFT JOIN clause to the query using the Order relation
+ * @method     ChildOrderProductQuery rightJoinOrder($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Order relation
+ * @method     ChildOrderProductQuery innerJoinOrder($relationAlias = null) Adds a INNER JOIN clause to the query using the Order relation
+ *
+ * @method     ChildOrderProductQuery leftJoinOrderAttributeCombination($relationAlias = null) Adds a LEFT JOIN clause to the query using the OrderAttributeCombination relation
+ * @method     ChildOrderProductQuery rightJoinOrderAttributeCombination($relationAlias = null) Adds a RIGHT JOIN clause to the query using the OrderAttributeCombination relation
+ * @method     ChildOrderProductQuery innerJoinOrderAttributeCombination($relationAlias = null) Adds a INNER JOIN clause to the query using the OrderAttributeCombination relation
+ *
+ * @method     ChildOrderProduct findOne(ConnectionInterface $con = null) Return the first ChildOrderProduct matching the query
+ * @method     ChildOrderProduct findOneOrCreate(ConnectionInterface $con = null) Return the first ChildOrderProduct matching the query, or a new ChildOrderProduct object populated from the query conditions when no match is found
+ *
+ * @method     ChildOrderProduct findOneById(int $id) Return the first ChildOrderProduct filtered by the id column
+ * @method     ChildOrderProduct findOneByOrderId(int $order_id) Return the first ChildOrderProduct filtered by the order_id column
+ * @method     ChildOrderProduct findOneByProductRef(string $product_ref) Return the first ChildOrderProduct filtered by the product_ref column
+ * @method     ChildOrderProduct findOneByProductSaleElementsRef(string $product_sale_elements_ref) Return the first ChildOrderProduct filtered by the product_sale_elements_ref column
+ * @method     ChildOrderProduct findOneByTitle(string $title) Return the first ChildOrderProduct filtered by the title column
+ * @method     ChildOrderProduct findOneByChapo(string $chapo) Return the first ChildOrderProduct filtered by the chapo column
+ * @method     ChildOrderProduct findOneByDescription(string $description) Return the first ChildOrderProduct filtered by the description column
+ * @method     ChildOrderProduct findOneByPostscriptum(string $postscriptum) Return the first ChildOrderProduct filtered by the postscriptum column
+ * @method     ChildOrderProduct findOneByQuantity(double $quantity) Return the first ChildOrderProduct filtered by the quantity column
+ * @method     ChildOrderProduct findOneByPrice(double $price) Return the first ChildOrderProduct filtered by the price column
+ * @method     ChildOrderProduct findOneByPromoPrice(string $promo_price) Return the first ChildOrderProduct filtered by the promo_price column
+ * @method     ChildOrderProduct findOneByWasNew(int $was_new) Return the first ChildOrderProduct filtered by the was_new column
+ * @method     ChildOrderProduct findOneByWasInPromo(int $was_in_promo) Return the first ChildOrderProduct filtered by the was_in_promo column
+ * @method     ChildOrderProduct findOneByWeight(string $weight) Return the first ChildOrderProduct filtered by the weight column
+ * @method     ChildOrderProduct findOneByTax(double $tax) Return the first ChildOrderProduct filtered by the tax column
+ * @method     ChildOrderProduct findOneByParent(int $parent) Return the first ChildOrderProduct filtered by the parent column
+ * @method     ChildOrderProduct findOneByCreatedAt(string $created_at) Return the first ChildOrderProduct filtered by the created_at column
+ * @method     ChildOrderProduct findOneByUpdatedAt(string $updated_at) Return the first ChildOrderProduct filtered by the updated_at column
+ *
+ * @method     array findById(int $id) Return ChildOrderProduct objects filtered by the id column
+ * @method     array findByOrderId(int $order_id) Return ChildOrderProduct objects filtered by the order_id column
+ * @method     array findByProductRef(string $product_ref) Return ChildOrderProduct objects filtered by the product_ref column
+ * @method     array findByProductSaleElementsRef(string $product_sale_elements_ref) Return ChildOrderProduct objects filtered by the product_sale_elements_ref column
+ * @method     array findByTitle(string $title) Return ChildOrderProduct objects filtered by the title column
+ * @method     array findByChapo(string $chapo) Return ChildOrderProduct objects filtered by the chapo column
+ * @method     array findByDescription(string $description) Return ChildOrderProduct objects filtered by the description column
+ * @method     array findByPostscriptum(string $postscriptum) Return ChildOrderProduct objects filtered by the postscriptum column
+ * @method     array findByQuantity(double $quantity) Return ChildOrderProduct objects filtered by the quantity column
+ * @method     array findByPrice(double $price) Return ChildOrderProduct objects filtered by the price column
+ * @method     array findByPromoPrice(string $promo_price) Return ChildOrderProduct objects filtered by the promo_price column
+ * @method     array findByWasNew(int $was_new) Return ChildOrderProduct objects filtered by the was_new column
+ * @method     array findByWasInPromo(int $was_in_promo) Return ChildOrderProduct objects filtered by the was_in_promo column
+ * @method     array findByWeight(string $weight) Return ChildOrderProduct objects filtered by the weight column
+ * @method     array findByTax(double $tax) Return ChildOrderProduct objects filtered by the tax column
+ * @method     array findByParent(int $parent) Return ChildOrderProduct objects filtered by the parent column
+ * @method     array findByCreatedAt(string $created_at) Return ChildOrderProduct objects filtered by the created_at column
+ * @method     array findByUpdatedAt(string $updated_at) Return ChildOrderProduct objects filtered by the updated_at column
+ *
+ */
+abstract class OrderProductQuery extends ModelCriteria
+{
+
+    /**
+     * Initializes internal state of \Thelia\Model\Base\OrderProductQuery object.
+     *
+     * @param     string $dbName The database name
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
+     */
+    public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\OrderProduct', $modelAlias = null)
+    {
+        parent::__construct($dbName, $modelName, $modelAlias);
+    }
+
+    /**
+     * Returns a new ChildOrderProductQuery object.
+     *
+     * @param     string $modelAlias The alias of a model in the query
+     * @param     Criteria $criteria Optional Criteria to build the query from
+     *
+     * @return ChildOrderProductQuery
+     */
+    public static function create($modelAlias = null, $criteria = null)
+    {
+        if ($criteria instanceof \Thelia\Model\OrderProductQuery) {
+            return $criteria;
+        }
+        $query = new \Thelia\Model\OrderProductQuery();
+        if (null !== $modelAlias) {
+            $query->setModelAlias($modelAlias);
+        }
+        if ($criteria instanceof Criteria) {
+            $query->mergeWith($criteria);
+        }
+
+        return $query;
+    }
+
+    /**
+     * Find object by primary key.
+     * Propel uses the instance pool to skip the database if the object exists.
+     * Go fast if the query is untouched.
+     *
+     * <code>
+     * $obj  = $c->findPk(12, $con);
+     * </code>
+     *
+     * @param mixed $key Primary key to use for the query
+     * @param ConnectionInterface $con an optional connection object
+     *
+     * @return ChildOrderProduct|array|mixed the result, formatted by the current formatter
+     */
+    public function findPk($key, $con = null)
+    {
+        if ($key === null) {
+            return null;
+        }
+        if ((null !== ($obj = OrderProductTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
+            // the object is already in the instance pool
+            return $obj;
+        }
+        if ($con === null) {
+            $con = Propel::getServiceContainer()->getReadConnection(OrderProductTableMap::DATABASE_NAME);
+        }
+        $this->basePreSelect($con);
+        if ($this->formatter || $this->modelAlias || $this->with || $this->select
+         || $this->selectColumns || $this->asColumns || $this->selectModifiers
+         || $this->map || $this->having || $this->joins) {
+            return $this->findPkComplex($key, $con);
+        } else {
+            return $this->findPkSimple($key, $con);
+        }
+    }
+
+    /**
+     * Find object by primary key using raw SQL to go fast.
+     * Bypass doSelect() and the object formatter by using generated code.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     ConnectionInterface $con A connection object
+     *
+     * @return   ChildOrderProduct A model object, or null if the key is not found
+     */
+    protected function findPkSimple($key, $con)
+    {
+        $sql = 'SELECT ID, ORDER_ID, PRODUCT_REF, PRODUCT_SALE_ELEMENTS_REF, TITLE, CHAPO, DESCRIPTION, POSTSCRIPTUM, QUANTITY, PRICE, PROMO_PRICE, WAS_NEW, WAS_IN_PROMO, WEIGHT, TAX, PARENT, CREATED_AT, UPDATED_AT FROM order_product WHERE ID = :p0';
+        try {
+            $stmt = $con->prepare($sql);
+            $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
+        }
+        $obj = null;
+        if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
+            $obj = new ChildOrderProduct();
+            $obj->hydrate($row);
+            OrderProductTableMap::addInstanceToPool($obj, (string) $key);
+        }
+        $stmt->closeCursor();
+
+        return $obj;
+    }
+
+    /**
+     * Find object by primary key.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     ConnectionInterface $con A connection object
+     *
+     * @return ChildOrderProduct|array|mixed the result, formatted by the current formatter
+     */
+    protected function findPkComplex($key, $con)
+    {
+        // As the query uses a PK condition, no limit(1) is necessary.
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $dataFetcher = $criteria
+            ->filterByPrimaryKey($key)
+            ->doSelect($con);
+
+        return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher);
+    }
+
+    /**
+     * Find objects by primary key
+     * <code>
+     * $objs = $c->findPks(array(12, 56, 832), $con);
+     * </code>
+     * @param     array $keys Primary keys to use for the query
+     * @param     ConnectionInterface $con an optional connection object
+     *
+     * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
+     */
+    public function findPks($keys, $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getReadConnection($this->getDbName());
+        }
+        $this->basePreSelect($con);
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $dataFetcher = $criteria
+            ->filterByPrimaryKeys($keys)
+            ->doSelect($con);
+
+        return $criteria->getFormatter()->init($criteria)->format($dataFetcher);
+    }
+
+    /**
+     * Filter the query by primary key
+     *
+     * @param     mixed $key Primary key to use for the query
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByPrimaryKey($key)
+    {
+
+        return $this->addUsingAlias(OrderProductTableMap::ID, $key, Criteria::EQUAL);
+    }
+
+    /**
+     * Filter the query by a list of primary keys
+     *
+     * @param     array $keys The list of primary key to use for the query
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByPrimaryKeys($keys)
+    {
+
+        return $this->addUsingAlias(OrderProductTableMap::ID, $keys, Criteria::IN);
+    }
+
+    /**
+     * Filter the query on the id column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterById(1234); // WHERE id = 1234
+     * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
+     * $query->filterById(array('min' => 12)); // WHERE id > 12
+     * </code>
+     *
+     * @param     mixed $id The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterById($id = null, $comparison = null)
+    {
+        if (is_array($id)) {
+            $useMinMax = false;
+            if (isset($id['min'])) {
+                $this->addUsingAlias(OrderProductTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($id['max'])) {
+                $this->addUsingAlias(OrderProductTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::ID, $id, $comparison);
+    }
+
+    /**
+     * Filter the query on the order_id column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByOrderId(1234); // WHERE order_id = 1234
+     * $query->filterByOrderId(array(12, 34)); // WHERE order_id IN (12, 34)
+     * $query->filterByOrderId(array('min' => 12)); // WHERE order_id > 12
+     * </code>
+     *
+     * @see       filterByOrder()
+     *
+     * @param     mixed $orderId The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByOrderId($orderId = null, $comparison = null)
+    {
+        if (is_array($orderId)) {
+            $useMinMax = false;
+            if (isset($orderId['min'])) {
+                $this->addUsingAlias(OrderProductTableMap::ORDER_ID, $orderId['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($orderId['max'])) {
+                $this->addUsingAlias(OrderProductTableMap::ORDER_ID, $orderId['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::ORDER_ID, $orderId, $comparison);
+    }
+
+    /**
+     * Filter the query on the product_ref column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByProductRef('fooValue');   // WHERE product_ref = 'fooValue'
+     * $query->filterByProductRef('%fooValue%'); // WHERE product_ref LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $productRef The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByProductRef($productRef = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($productRef)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $productRef)) {
+                $productRef = str_replace('*', '%', $productRef);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::PRODUCT_REF, $productRef, $comparison);
+    }
+
+    /**
+     * Filter the query on the product_sale_elements_ref column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByProductSaleElementsRef('fooValue');   // WHERE product_sale_elements_ref = 'fooValue'
+     * $query->filterByProductSaleElementsRef('%fooValue%'); // WHERE product_sale_elements_ref LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $productSaleElementsRef The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByProductSaleElementsRef($productSaleElementsRef = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($productSaleElementsRef)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $productSaleElementsRef)) {
+                $productSaleElementsRef = str_replace('*', '%', $productSaleElementsRef);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF, $productSaleElementsRef, $comparison);
+    }
+
+    /**
+     * Filter the query on the title column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByTitle('fooValue');   // WHERE title = 'fooValue'
+     * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $title The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByTitle($title = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($title)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $title)) {
+                $title = str_replace('*', '%', $title);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::TITLE, $title, $comparison);
+    }
+
+    /**
+     * Filter the query on the chapo column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByChapo('fooValue');   // WHERE chapo = 'fooValue'
+     * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $chapo The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByChapo($chapo = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($chapo)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $chapo)) {
+                $chapo = str_replace('*', '%', $chapo);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::CHAPO, $chapo, $comparison);
+    }
+
+    /**
+     * Filter the query on the description column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByDescription('fooValue');   // WHERE description = 'fooValue'
+     * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $description The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByDescription($description = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($description)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $description)) {
+                $description = str_replace('*', '%', $description);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::DESCRIPTION, $description, $comparison);
+    }
+
+    /**
+     * Filter the query on the postscriptum column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByPostscriptum('fooValue');   // WHERE postscriptum = 'fooValue'
+     * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $postscriptum The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByPostscriptum($postscriptum = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($postscriptum)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $postscriptum)) {
+                $postscriptum = str_replace('*', '%', $postscriptum);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::POSTSCRIPTUM, $postscriptum, $comparison);
+    }
+
+    /**
+     * Filter the query on the quantity column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByQuantity(1234); // WHERE quantity = 1234
+     * $query->filterByQuantity(array(12, 34)); // WHERE quantity IN (12, 34)
+     * $query->filterByQuantity(array('min' => 12)); // WHERE quantity > 12
+     * </code>
+     *
+     * @param     mixed $quantity The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByQuantity($quantity = null, $comparison = null)
+    {
+        if (is_array($quantity)) {
+            $useMinMax = false;
+            if (isset($quantity['min'])) {
+                $this->addUsingAlias(OrderProductTableMap::QUANTITY, $quantity['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($quantity['max'])) {
+                $this->addUsingAlias(OrderProductTableMap::QUANTITY, $quantity['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::QUANTITY, $quantity, $comparison);
+    }
+
+    /**
+     * Filter the query on the price column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByPrice(1234); // WHERE price = 1234
+     * $query->filterByPrice(array(12, 34)); // WHERE price IN (12, 34)
+     * $query->filterByPrice(array('min' => 12)); // WHERE price > 12
+     * </code>
+     *
+     * @param     mixed $price The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByPrice($price = null, $comparison = null)
+    {
+        if (is_array($price)) {
+            $useMinMax = false;
+            if (isset($price['min'])) {
+                $this->addUsingAlias(OrderProductTableMap::PRICE, $price['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($price['max'])) {
+                $this->addUsingAlias(OrderProductTableMap::PRICE, $price['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::PRICE, $price, $comparison);
+    }
+
+    /**
+     * Filter the query on the promo_price column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByPromoPrice('fooValue');   // WHERE promo_price = 'fooValue'
+     * $query->filterByPromoPrice('%fooValue%'); // WHERE promo_price LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $promoPrice The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByPromoPrice($promoPrice = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($promoPrice)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $promoPrice)) {
+                $promoPrice = str_replace('*', '%', $promoPrice);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::PROMO_PRICE, $promoPrice, $comparison);
+    }
+
+    /**
+     * Filter the query on the was_new column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByWasNew(1234); // WHERE was_new = 1234
+     * $query->filterByWasNew(array(12, 34)); // WHERE was_new IN (12, 34)
+     * $query->filterByWasNew(array('min' => 12)); // WHERE was_new > 12
+     * </code>
+     *
+     * @param     mixed $wasNew The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByWasNew($wasNew = null, $comparison = null)
+    {
+        if (is_array($wasNew)) {
+            $useMinMax = false;
+            if (isset($wasNew['min'])) {
+                $this->addUsingAlias(OrderProductTableMap::WAS_NEW, $wasNew['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($wasNew['max'])) {
+                $this->addUsingAlias(OrderProductTableMap::WAS_NEW, $wasNew['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::WAS_NEW, $wasNew, $comparison);
+    }
+
+    /**
+     * Filter the query on the was_in_promo column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByWasInPromo(1234); // WHERE was_in_promo = 1234
+     * $query->filterByWasInPromo(array(12, 34)); // WHERE was_in_promo IN (12, 34)
+     * $query->filterByWasInPromo(array('min' => 12)); // WHERE was_in_promo > 12
+     * </code>
+     *
+     * @param     mixed $wasInPromo The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByWasInPromo($wasInPromo = null, $comparison = null)
+    {
+        if (is_array($wasInPromo)) {
+            $useMinMax = false;
+            if (isset($wasInPromo['min'])) {
+                $this->addUsingAlias(OrderProductTableMap::WAS_IN_PROMO, $wasInPromo['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($wasInPromo['max'])) {
+                $this->addUsingAlias(OrderProductTableMap::WAS_IN_PROMO, $wasInPromo['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::WAS_IN_PROMO, $wasInPromo, $comparison);
+    }
+
+    /**
+     * Filter the query on the weight column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByWeight('fooValue');   // WHERE weight = 'fooValue'
+     * $query->filterByWeight('%fooValue%'); // WHERE weight LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $weight The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByWeight($weight = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($weight)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $weight)) {
+                $weight = str_replace('*', '%', $weight);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::WEIGHT, $weight, $comparison);
+    }
+
+    /**
+     * Filter the query on the tax column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByTax(1234); // WHERE tax = 1234
+     * $query->filterByTax(array(12, 34)); // WHERE tax IN (12, 34)
+     * $query->filterByTax(array('min' => 12)); // WHERE tax > 12
+     * </code>
+     *
+     * @param     mixed $tax The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByTax($tax = null, $comparison = null)
+    {
+        if (is_array($tax)) {
+            $useMinMax = false;
+            if (isset($tax['min'])) {
+                $this->addUsingAlias(OrderProductTableMap::TAX, $tax['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($tax['max'])) {
+                $this->addUsingAlias(OrderProductTableMap::TAX, $tax['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::TAX, $tax, $comparison);
+    }
+
+    /**
+     * Filter the query on the parent column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByParent(1234); // WHERE parent = 1234
+     * $query->filterByParent(array(12, 34)); // WHERE parent IN (12, 34)
+     * $query->filterByParent(array('min' => 12)); // WHERE parent > 12
+     * </code>
+     *
+     * @param     mixed $parent The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByParent($parent = null, $comparison = null)
+    {
+        if (is_array($parent)) {
+            $useMinMax = false;
+            if (isset($parent['min'])) {
+                $this->addUsingAlias(OrderProductTableMap::PARENT, $parent['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($parent['max'])) {
+                $this->addUsingAlias(OrderProductTableMap::PARENT, $parent['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::PARENT, $parent, $comparison);
+    }
+
+    /**
+     * Filter the query on the created_at column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14'
+     * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14'
+     * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
+     * </code>
+     *
+     * @param     mixed $createdAt The value to use as filter.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Empty strings are treated as NULL.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByCreatedAt($createdAt = null, $comparison = null)
+    {
+        if (is_array($createdAt)) {
+            $useMinMax = false;
+            if (isset($createdAt['min'])) {
+                $this->addUsingAlias(OrderProductTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($createdAt['max'])) {
+                $this->addUsingAlias(OrderProductTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::CREATED_AT, $createdAt, $comparison);
+    }
+
+    /**
+     * Filter the query on the updated_at column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14'
+     * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14'
+     * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
+     * </code>
+     *
+     * @param     mixed $updatedAt The value to use as filter.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Empty strings are treated as NULL.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByUpdatedAt($updatedAt = null, $comparison = null)
+    {
+        if (is_array($updatedAt)) {
+            $useMinMax = false;
+            if (isset($updatedAt['min'])) {
+                $this->addUsingAlias(OrderProductTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($updatedAt['max'])) {
+                $this->addUsingAlias(OrderProductTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::UPDATED_AT, $updatedAt, $comparison);
+    }
+
+    /**
+     * Filter the query by a related \Thelia\Model\Order object
+     *
+     * @param \Thelia\Model\Order|ObjectCollection $order The related object(s) to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByOrder($order, $comparison = null)
+    {
+        if ($order instanceof \Thelia\Model\Order) {
+            return $this
+                ->addUsingAlias(OrderProductTableMap::ORDER_ID, $order->getId(), $comparison);
+        } elseif ($order instanceof ObjectCollection) {
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+
+            return $this
+                ->addUsingAlias(OrderProductTableMap::ORDER_ID, $order->toKeyValue('PrimaryKey', 'Id'), $comparison);
+        } else {
+            throw new PropelException('filterByOrder() only accepts arguments of type \Thelia\Model\Order or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the Order relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function joinOrder($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('Order');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'Order');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the Order relation Order object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return   \Thelia\Model\OrderQuery A secondary query class using the current class as primary query
+     */
+    public function useOrderQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        return $this
+            ->joinOrder($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'Order', '\Thelia\Model\OrderQuery');
+    }
+
+    /**
+     * Filter the query by a related \Thelia\Model\OrderAttributeCombination object
+     *
+     * @param \Thelia\Model\OrderAttributeCombination|ObjectCollection $orderAttributeCombination  the related object to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByOrderAttributeCombination($orderAttributeCombination, $comparison = null)
+    {
+        if ($orderAttributeCombination instanceof \Thelia\Model\OrderAttributeCombination) {
+            return $this
+                ->addUsingAlias(OrderProductTableMap::ID, $orderAttributeCombination->getOrderProductId(), $comparison);
+        } elseif ($orderAttributeCombination instanceof ObjectCollection) {
+            return $this
+                ->useOrderAttributeCombinationQuery()
+                ->filterByPrimaryKeys($orderAttributeCombination->getPrimaryKeys())
+                ->endUse();
+        } else {
+            throw new PropelException('filterByOrderAttributeCombination() only accepts arguments of type \Thelia\Model\OrderAttributeCombination or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the OrderAttributeCombination relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function joinOrderAttributeCombination($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('OrderAttributeCombination');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'OrderAttributeCombination');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the OrderAttributeCombination relation OrderAttributeCombination object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return   \Thelia\Model\OrderAttributeCombinationQuery A secondary query class using the current class as primary query
+     */
+    public function useOrderAttributeCombinationQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        return $this
+            ->joinOrderAttributeCombination($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'OrderAttributeCombination', '\Thelia\Model\OrderAttributeCombinationQuery');
+    }
+
+    /**
+     * Exclude object from result
+     *
+     * @param   ChildOrderProduct $orderProduct Object to remove from the list of results
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function prune($orderProduct = null)
+    {
+        if ($orderProduct) {
+            $this->addUsingAlias(OrderProductTableMap::ID, $orderProduct->getId(), Criteria::NOT_EQUAL);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Deletes all rows from the order_product table.
+     *
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).
+     */
+    public function doDeleteAll(ConnectionInterface $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductTableMap::DATABASE_NAME);
+        }
+        $affectedRows = 0; // initialize var to track total num of affected rows
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table or we could emulating ON DELETE CASCADE, etc.
+            $con->beginTransaction();
+            $affectedRows += parent::doDeleteAll($con);
+            // Because this db requires some delete cascade/set null emulation, we have to
+            // clear the cached instance *after* the emulation has happened (since
+            // instances get re-added by the select statement contained therein).
+            OrderProductTableMap::clearInstancePool();
+            OrderProductTableMap::clearRelatedInstancePool();
+
+            $con->commit();
+        } catch (PropelException $e) {
+            $con->rollBack();
+            throw $e;
+        }
+
+        return $affectedRows;
+    }
+
+    /**
+     * Performs a DELETE on the database, given a ChildOrderProduct or Criteria object OR a primary key value.
+     *
+     * @param mixed               $values Criteria or ChildOrderProduct object or primary key or array of primary keys
+     *              which is used to create the DELETE statement
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     *                if supported by native driver or if emulated using Propel.
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+     public function delete(ConnectionInterface $con = null)
+     {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductTableMap::DATABASE_NAME);
+        }
+
+        $criteria = $this;
+
+        // Set the correct dbName
+        $criteria->setDbName(OrderProductTableMap::DATABASE_NAME);
+
+        $affectedRows = 0; // initialize var to track total num of affected rows
+
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table or we could emulating ON DELETE CASCADE, etc.
+            $con->beginTransaction();
+
+
+        OrderProductTableMap::removeInstanceFromPool($criteria);
+
+            $affectedRows += ModelCriteria::delete($con);
+            OrderProductTableMap::clearRelatedInstancePool();
+            $con->commit();
+
+            return $affectedRows;
+        } catch (PropelException $e) {
+            $con->rollBack();
+            throw $e;
+        }
+    }
+
+    // timestampable behavior
+
+    /**
+     * Filter by the latest updated
+     *
+     * @param      int $nbDays Maximum age of the latest update in days
+     *
+     * @return     ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function recentlyUpdated($nbDays = 7)
+    {
+        return $this->addUsingAlias(OrderProductTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+    }
+
+    /**
+     * Filter by the latest created
+     *
+     * @param      int $nbDays Maximum age of in days
+     *
+     * @return     ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function recentlyCreated($nbDays = 7)
+    {
+        return $this->addUsingAlias(OrderProductTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+    }
+
+    /**
+     * Order by update date desc
+     *
+     * @return     ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function lastUpdatedFirst()
+    {
+        return $this->addDescendingOrderByColumn(OrderProductTableMap::UPDATED_AT);
+    }
+
+    /**
+     * Order by update date asc
+     *
+     * @return     ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function firstUpdatedFirst()
+    {
+        return $this->addAscendingOrderByColumn(OrderProductTableMap::UPDATED_AT);
+    }
+
+    /**
+     * Order by create date desc
+     *
+     * @return     ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function lastCreatedFirst()
+    {
+        return $this->addDescendingOrderByColumn(OrderProductTableMap::CREATED_AT);
+    }
+
+    /**
+     * Order by create date asc
+     *
+     * @return     ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function firstCreatedFirst()
+    {
+        return $this->addAscendingOrderByColumn(OrderProductTableMap::CREATED_AT);
+    }
+
+} // OrderProductQuery
diff --git a/core/lib/Thelia/Model/Map/OrderProductTableMap.php b/core/lib/Thelia/Model/Map/OrderProductTableMap.php
new file mode 100644
index 000000000..3820ad081
--- /dev/null
+++ b/core/lib/Thelia/Model/Map/OrderProductTableMap.php
@@ -0,0 +1,561 @@
+<?php
+
+namespace Thelia\Model\Map;
+
+use Propel\Runtime\Propel;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\InstancePoolTrait;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Exception\PropelException;
+use Propel\Runtime\Map\RelationMap;
+use Propel\Runtime\Map\TableMap;
+use Propel\Runtime\Map\TableMapTrait;
+use Thelia\Model\OrderProduct;
+use Thelia\Model\OrderProductQuery;
+
+
+/**
+ * This class defines the structure of the 'order_product' table.
+ *
+ *
+ *
+ * This map class is used by Propel to do runtime db structure discovery.
+ * For example, the createSelectSql() method checks the type of a given column used in an
+ * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
+ * (i.e. if it's a text column type).
+ *
+ */
+class OrderProductTableMap extends TableMap
+{
+    use InstancePoolTrait;
+    use TableMapTrait;
+    /**
+     * The (dot-path) name of this class
+     */
+    const CLASS_NAME = 'Thelia.Model.Map.OrderProductTableMap';
+
+    /**
+     * The default database name for this class
+     */
+    const DATABASE_NAME = 'thelia';
+
+    /**
+     * The table name for this class
+     */
+    const TABLE_NAME = 'order_product';
+
+    /**
+     * The related Propel class for this table
+     */
+    const OM_CLASS = '\\Thelia\\Model\\OrderProduct';
+
+    /**
+     * A class that can be returned by this tableMap
+     */
+    const CLASS_DEFAULT = 'Thelia.Model.OrderProduct';
+
+    /**
+     * The total number of columns
+     */
+    const NUM_COLUMNS = 18;
+
+    /**
+     * The number of lazy-loaded columns
+     */
+    const NUM_LAZY_LOAD_COLUMNS = 0;
+
+    /**
+     * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
+     */
+    const NUM_HYDRATE_COLUMNS = 18;
+
+    /**
+     * the column name for the ID field
+     */
+    const ID = 'order_product.ID';
+
+    /**
+     * the column name for the ORDER_ID field
+     */
+    const ORDER_ID = 'order_product.ORDER_ID';
+
+    /**
+     * the column name for the PRODUCT_REF field
+     */
+    const PRODUCT_REF = 'order_product.PRODUCT_REF';
+
+    /**
+     * the column name for the PRODUCT_SALE_ELEMENTS_REF field
+     */
+    const PRODUCT_SALE_ELEMENTS_REF = 'order_product.PRODUCT_SALE_ELEMENTS_REF';
+
+    /**
+     * the column name for the TITLE field
+     */
+    const TITLE = 'order_product.TITLE';
+
+    /**
+     * the column name for the CHAPO field
+     */
+    const CHAPO = 'order_product.CHAPO';
+
+    /**
+     * the column name for the DESCRIPTION field
+     */
+    const DESCRIPTION = 'order_product.DESCRIPTION';
+
+    /**
+     * the column name for the POSTSCRIPTUM field
+     */
+    const POSTSCRIPTUM = 'order_product.POSTSCRIPTUM';
+
+    /**
+     * the column name for the QUANTITY field
+     */
+    const QUANTITY = 'order_product.QUANTITY';
+
+    /**
+     * the column name for the PRICE field
+     */
+    const PRICE = 'order_product.PRICE';
+
+    /**
+     * the column name for the PROMO_PRICE field
+     */
+    const PROMO_PRICE = 'order_product.PROMO_PRICE';
+
+    /**
+     * the column name for the WAS_NEW field
+     */
+    const WAS_NEW = 'order_product.WAS_NEW';
+
+    /**
+     * the column name for the WAS_IN_PROMO field
+     */
+    const WAS_IN_PROMO = 'order_product.WAS_IN_PROMO';
+
+    /**
+     * the column name for the WEIGHT field
+     */
+    const WEIGHT = 'order_product.WEIGHT';
+
+    /**
+     * the column name for the TAX field
+     */
+    const TAX = 'order_product.TAX';
+
+    /**
+     * the column name for the PARENT field
+     */
+    const PARENT = 'order_product.PARENT';
+
+    /**
+     * the column name for the CREATED_AT field
+     */
+    const CREATED_AT = 'order_product.CREATED_AT';
+
+    /**
+     * the column name for the UPDATED_AT field
+     */
+    const UPDATED_AT = 'order_product.UPDATED_AT';
+
+    /**
+     * The default string format for model objects of the related table
+     */
+    const DEFAULT_STRING_FORMAT = 'YAML';
+
+    /**
+     * holds an array of fieldnames
+     *
+     * first dimension keys are the type constants
+     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
+     */
+    protected static $fieldNames = array (
+        self::TYPE_PHPNAME       => array('Id', 'OrderId', 'ProductRef', 'ProductSaleElementsRef', 'Title', 'Chapo', 'Description', 'Postscriptum', 'Quantity', 'Price', 'PromoPrice', 'WasNew', 'WasInPromo', 'Weight', 'Tax', 'Parent', 'CreatedAt', 'UpdatedAt', ),
+        self::TYPE_STUDLYPHPNAME => array('id', 'orderId', 'productRef', 'productSaleElementsRef', 'title', 'chapo', 'description', 'postscriptum', 'quantity', 'price', 'promoPrice', 'wasNew', 'wasInPromo', 'weight', 'tax', 'parent', 'createdAt', 'updatedAt', ),
+        self::TYPE_COLNAME       => array(OrderProductTableMap::ID, OrderProductTableMap::ORDER_ID, OrderProductTableMap::PRODUCT_REF, OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF, OrderProductTableMap::TITLE, OrderProductTableMap::CHAPO, OrderProductTableMap::DESCRIPTION, OrderProductTableMap::POSTSCRIPTUM, OrderProductTableMap::QUANTITY, OrderProductTableMap::PRICE, OrderProductTableMap::PROMO_PRICE, OrderProductTableMap::WAS_NEW, OrderProductTableMap::WAS_IN_PROMO, OrderProductTableMap::WEIGHT, OrderProductTableMap::TAX, OrderProductTableMap::PARENT, OrderProductTableMap::CREATED_AT, OrderProductTableMap::UPDATED_AT, ),
+        self::TYPE_RAW_COLNAME   => array('ID', 'ORDER_ID', 'PRODUCT_REF', 'PRODUCT_SALE_ELEMENTS_REF', 'TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM', 'QUANTITY', 'PRICE', 'PROMO_PRICE', 'WAS_NEW', 'WAS_IN_PROMO', 'WEIGHT', 'TAX', 'PARENT', 'CREATED_AT', 'UPDATED_AT', ),
+        self::TYPE_FIELDNAME     => array('id', 'order_id', 'product_ref', 'product_sale_elements_ref', 'title', 'chapo', 'description', 'postscriptum', 'quantity', 'price', 'promo_price', 'was_new', 'was_in_promo', 'weight', 'tax', 'parent', 'created_at', 'updated_at', ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
+    );
+
+    /**
+     * holds an array of keys for quick access to the fieldnames array
+     *
+     * first dimension keys are the type constants
+     * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
+     */
+    protected static $fieldKeys = array (
+        self::TYPE_PHPNAME       => array('Id' => 0, 'OrderId' => 1, 'ProductRef' => 2, 'ProductSaleElementsRef' => 3, 'Title' => 4, 'Chapo' => 5, 'Description' => 6, 'Postscriptum' => 7, 'Quantity' => 8, 'Price' => 9, 'PromoPrice' => 10, 'WasNew' => 11, 'WasInPromo' => 12, 'Weight' => 13, 'Tax' => 14, 'Parent' => 15, 'CreatedAt' => 16, 'UpdatedAt' => 17, ),
+        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'orderId' => 1, 'productRef' => 2, 'productSaleElementsRef' => 3, 'title' => 4, 'chapo' => 5, 'description' => 6, 'postscriptum' => 7, 'quantity' => 8, 'price' => 9, 'promoPrice' => 10, 'wasNew' => 11, 'wasInPromo' => 12, 'weight' => 13, 'tax' => 14, 'parent' => 15, 'createdAt' => 16, 'updatedAt' => 17, ),
+        self::TYPE_COLNAME       => array(OrderProductTableMap::ID => 0, OrderProductTableMap::ORDER_ID => 1, OrderProductTableMap::PRODUCT_REF => 2, OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF => 3, OrderProductTableMap::TITLE => 4, OrderProductTableMap::CHAPO => 5, OrderProductTableMap::DESCRIPTION => 6, OrderProductTableMap::POSTSCRIPTUM => 7, OrderProductTableMap::QUANTITY => 8, OrderProductTableMap::PRICE => 9, OrderProductTableMap::PROMO_PRICE => 10, OrderProductTableMap::WAS_NEW => 11, OrderProductTableMap::WAS_IN_PROMO => 12, OrderProductTableMap::WEIGHT => 13, OrderProductTableMap::TAX => 14, OrderProductTableMap::PARENT => 15, OrderProductTableMap::CREATED_AT => 16, OrderProductTableMap::UPDATED_AT => 17, ),
+        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'ORDER_ID' => 1, 'PRODUCT_REF' => 2, 'PRODUCT_SALE_ELEMENTS_REF' => 3, 'TITLE' => 4, 'CHAPO' => 5, 'DESCRIPTION' => 6, 'POSTSCRIPTUM' => 7, 'QUANTITY' => 8, 'PRICE' => 9, 'PROMO_PRICE' => 10, 'WAS_NEW' => 11, 'WAS_IN_PROMO' => 12, 'WEIGHT' => 13, 'TAX' => 14, 'PARENT' => 15, 'CREATED_AT' => 16, 'UPDATED_AT' => 17, ),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'order_id' => 1, 'product_ref' => 2, 'product_sale_elements_ref' => 3, 'title' => 4, 'chapo' => 5, 'description' => 6, 'postscriptum' => 7, 'quantity' => 8, 'price' => 9, 'promo_price' => 10, 'was_new' => 11, 'was_in_promo' => 12, 'weight' => 13, 'tax' => 14, 'parent' => 15, 'created_at' => 16, 'updated_at' => 17, ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
+    );
+
+    /**
+     * Initialize the table attributes and columns
+     * Relations are not initialized by this method since they are lazy loaded
+     *
+     * @return void
+     * @throws PropelException
+     */
+    public function initialize()
+    {
+        // attributes
+        $this->setName('order_product');
+        $this->setPhpName('OrderProduct');
+        $this->setClassName('\\Thelia\\Model\\OrderProduct');
+        $this->setPackage('Thelia.Model');
+        $this->setUseIdGenerator(true);
+        // columns
+        $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
+        $this->addForeignKey('ORDER_ID', 'OrderId', 'INTEGER', 'order', 'ID', true, null, null);
+        $this->addColumn('PRODUCT_REF', 'ProductRef', 'VARCHAR', true, 255, null);
+        $this->addColumn('PRODUCT_SALE_ELEMENTS_REF', 'ProductSaleElementsRef', 'VARCHAR', true, 255, null);
+        $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
+        $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
+        $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
+        $this->addColumn('POSTSCRIPTUM', 'Postscriptum', 'LONGVARCHAR', false, null, null);
+        $this->addColumn('QUANTITY', 'Quantity', 'FLOAT', true, null, null);
+        $this->addColumn('PRICE', 'Price', 'FLOAT', true, null, null);
+        $this->addColumn('PROMO_PRICE', 'PromoPrice', 'VARCHAR', false, 45, null);
+        $this->addColumn('WAS_NEW', 'WasNew', 'TINYINT', true, null, null);
+        $this->addColumn('WAS_IN_PROMO', 'WasInPromo', 'TINYINT', true, null, null);
+        $this->addColumn('WEIGHT', 'Weight', 'VARCHAR', false, 45, null);
+        $this->addColumn('TAX', 'Tax', 'FLOAT', false, null, null);
+        $this->addColumn('PARENT', 'Parent', 'INTEGER', false, null, null);
+        $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
+        $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
+    } // initialize()
+
+    /**
+     * Build the RelationMap objects for this table relationships
+     */
+    public function buildRelations()
+    {
+        $this->addRelation('Order', '\\Thelia\\Model\\Order', RelationMap::MANY_TO_ONE, array('order_id' => 'id', ), 'CASCADE', 'RESTRICT');
+        $this->addRelation('OrderAttributeCombination', '\\Thelia\\Model\\OrderAttributeCombination', RelationMap::ONE_TO_MANY, array('id' => 'order_product_id', ), 'CASCADE', 'RESTRICT', 'OrderAttributeCombinations');
+    } // buildRelations()
+
+    /**
+     *
+     * Gets the list of behaviors registered for this table
+     *
+     * @return array Associative array (name => parameters) of behaviors
+     */
+    public function getBehaviors()
+    {
+        return array(
+            'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
+        );
+    } // getBehaviors()
+    /**
+     * Method to invalidate the instance pool of all tables related to order_product     * by a foreign key with ON DELETE CASCADE
+     */
+    public static function clearRelatedInstancePool()
+    {
+        // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool,
+        // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule.
+                OrderAttributeCombinationTableMap::clearInstancePool();
+            }
+
+    /**
+     * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
+     *
+     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+     * a multi-column primary key, a serialize()d version of the primary key will be returned.
+     *
+     * @param array  $row       resultset row.
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+     */
+    public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+        // If the PK cannot be derived from the row, return NULL.
+        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+            return null;
+        }
+
+        return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+    }
+
+    /**
+     * Retrieves the primary key from the DB resultset row
+     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+     * a multi-column primary key, an array of the primary key columns will be returned.
+     *
+     * @param array  $row       resultset row.
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+     *
+     * @return mixed The primary key of the row
+     */
+    public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+
+            return (int) $row[
+                            $indexType == TableMap::TYPE_NUM
+                            ? 0 + $offset
+                            : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
+                        ];
+    }
+
+    /**
+     * The class that the tableMap will make instances of.
+     *
+     * If $withPrefix is true, the returned path
+     * uses a dot-path notation which is translated into a path
+     * relative to a location on the PHP include_path.
+     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
+     *
+     * @param boolean $withPrefix Whether or not to return the path with the class name
+     * @return string path.to.ClassName
+     */
+    public static function getOMClass($withPrefix = true)
+    {
+        return $withPrefix ? OrderProductTableMap::CLASS_DEFAULT : OrderProductTableMap::OM_CLASS;
+    }
+
+    /**
+     * Populates an object of the default type or an object that inherit from the default.
+     *
+     * @param array  $row       row returned by DataFetcher->fetch().
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+                                 One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     * @return array (OrderProduct object, last column rank)
+     */
+    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+        $key = OrderProductTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
+        if (null !== ($obj = OrderProductTableMap::getInstanceFromPool($key))) {
+            // We no longer rehydrate the object, since this can cause data loss.
+            // See http://www.propelorm.org/ticket/509
+            // $obj->hydrate($row, $offset, true); // rehydrate
+            $col = $offset + OrderProductTableMap::NUM_HYDRATE_COLUMNS;
+        } else {
+            $cls = OrderProductTableMap::OM_CLASS;
+            $obj = new $cls();
+            $col = $obj->hydrate($row, $offset, false, $indexType);
+            OrderProductTableMap::addInstanceToPool($obj, $key);
+        }
+
+        return array($obj, $col);
+    }
+
+    /**
+     * The returned array will contain objects of the default type or
+     * objects that inherit from the default.
+     *
+     * @param DataFetcherInterface $dataFetcher
+     * @return array
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function populateObjects(DataFetcherInterface $dataFetcher)
+    {
+        $results = array();
+
+        // set the class once to avoid overhead in the loop
+        $cls = static::getOMClass(false);
+        // populate the object(s)
+        while ($row = $dataFetcher->fetch()) {
+            $key = OrderProductTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
+            if (null !== ($obj = OrderProductTableMap::getInstanceFromPool($key))) {
+                // We no longer rehydrate the object, since this can cause data loss.
+                // See http://www.propelorm.org/ticket/509
+                // $obj->hydrate($row, 0, true); // rehydrate
+                $results[] = $obj;
+            } else {
+                $obj = new $cls();
+                $obj->hydrate($row);
+                $results[] = $obj;
+                OrderProductTableMap::addInstanceToPool($obj, $key);
+            } // if key exists
+        }
+
+        return $results;
+    }
+    /**
+     * Add all the columns needed to create a new object.
+     *
+     * Note: any columns that were marked with lazyLoad="true" in the
+     * XML schema will not be added to the select list and only loaded
+     * on demand.
+     *
+     * @param Criteria $criteria object containing the columns to add.
+     * @param string   $alias    optional table alias
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function addSelectColumns(Criteria $criteria, $alias = null)
+    {
+        if (null === $alias) {
+            $criteria->addSelectColumn(OrderProductTableMap::ID);
+            $criteria->addSelectColumn(OrderProductTableMap::ORDER_ID);
+            $criteria->addSelectColumn(OrderProductTableMap::PRODUCT_REF);
+            $criteria->addSelectColumn(OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF);
+            $criteria->addSelectColumn(OrderProductTableMap::TITLE);
+            $criteria->addSelectColumn(OrderProductTableMap::CHAPO);
+            $criteria->addSelectColumn(OrderProductTableMap::DESCRIPTION);
+            $criteria->addSelectColumn(OrderProductTableMap::POSTSCRIPTUM);
+            $criteria->addSelectColumn(OrderProductTableMap::QUANTITY);
+            $criteria->addSelectColumn(OrderProductTableMap::PRICE);
+            $criteria->addSelectColumn(OrderProductTableMap::PROMO_PRICE);
+            $criteria->addSelectColumn(OrderProductTableMap::WAS_NEW);
+            $criteria->addSelectColumn(OrderProductTableMap::WAS_IN_PROMO);
+            $criteria->addSelectColumn(OrderProductTableMap::WEIGHT);
+            $criteria->addSelectColumn(OrderProductTableMap::TAX);
+            $criteria->addSelectColumn(OrderProductTableMap::PARENT);
+            $criteria->addSelectColumn(OrderProductTableMap::CREATED_AT);
+            $criteria->addSelectColumn(OrderProductTableMap::UPDATED_AT);
+        } else {
+            $criteria->addSelectColumn($alias . '.ID');
+            $criteria->addSelectColumn($alias . '.ORDER_ID');
+            $criteria->addSelectColumn($alias . '.PRODUCT_REF');
+            $criteria->addSelectColumn($alias . '.PRODUCT_SALE_ELEMENTS_REF');
+            $criteria->addSelectColumn($alias . '.TITLE');
+            $criteria->addSelectColumn($alias . '.CHAPO');
+            $criteria->addSelectColumn($alias . '.DESCRIPTION');
+            $criteria->addSelectColumn($alias . '.POSTSCRIPTUM');
+            $criteria->addSelectColumn($alias . '.QUANTITY');
+            $criteria->addSelectColumn($alias . '.PRICE');
+            $criteria->addSelectColumn($alias . '.PROMO_PRICE');
+            $criteria->addSelectColumn($alias . '.WAS_NEW');
+            $criteria->addSelectColumn($alias . '.WAS_IN_PROMO');
+            $criteria->addSelectColumn($alias . '.WEIGHT');
+            $criteria->addSelectColumn($alias . '.TAX');
+            $criteria->addSelectColumn($alias . '.PARENT');
+            $criteria->addSelectColumn($alias . '.CREATED_AT');
+            $criteria->addSelectColumn($alias . '.UPDATED_AT');
+        }
+    }
+
+    /**
+     * Returns the TableMap related to this object.
+     * This method is not needed for general use but a specific application could have a need.
+     * @return TableMap
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function getTableMap()
+    {
+        return Propel::getServiceContainer()->getDatabaseMap(OrderProductTableMap::DATABASE_NAME)->getTable(OrderProductTableMap::TABLE_NAME);
+    }
+
+    /**
+     * Add a TableMap instance to the database for this tableMap class.
+     */
+    public static function buildTableMap()
+    {
+      $dbMap = Propel::getServiceContainer()->getDatabaseMap(OrderProductTableMap::DATABASE_NAME);
+      if (!$dbMap->hasTable(OrderProductTableMap::TABLE_NAME)) {
+        $dbMap->addTableObject(new OrderProductTableMap());
+      }
+    }
+
+    /**
+     * Performs a DELETE on the database, given a OrderProduct or Criteria object OR a primary key value.
+     *
+     * @param mixed               $values Criteria or OrderProduct object or primary key or array of primary keys
+     *              which is used to create the DELETE statement
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     *                if supported by native driver or if emulated using Propel.
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+     public static function doDelete($values, ConnectionInterface $con = null)
+     {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductTableMap::DATABASE_NAME);
+        }
+
+        if ($values instanceof Criteria) {
+            // rename for clarity
+            $criteria = $values;
+        } elseif ($values instanceof \Thelia\Model\OrderProduct) { // it's a model object
+            // create criteria based on pk values
+            $criteria = $values->buildPkeyCriteria();
+        } else { // it's a primary key, or an array of pks
+            $criteria = new Criteria(OrderProductTableMap::DATABASE_NAME);
+            $criteria->add(OrderProductTableMap::ID, (array) $values, Criteria::IN);
+        }
+
+        $query = OrderProductQuery::create()->mergeWith($criteria);
+
+        if ($values instanceof Criteria) { OrderProductTableMap::clearInstancePool();
+        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
+            foreach ((array) $values as $singleval) { OrderProductTableMap::removeInstanceFromPool($singleval);
+            }
+        }
+
+        return $query->delete($con);
+    }
+
+    /**
+     * Deletes all rows from the order_product table.
+     *
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).
+     */
+    public static function doDeleteAll(ConnectionInterface $con = null)
+    {
+        return OrderProductQuery::create()->doDeleteAll($con);
+    }
+
+    /**
+     * Performs an INSERT on the database, given a OrderProduct or Criteria object.
+     *
+     * @param mixed               $criteria Criteria or OrderProduct object containing data that is used to create the INSERT statement.
+     * @param ConnectionInterface $con the ConnectionInterface connection to use
+     * @return mixed           The new primary key.
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function doInsert($criteria, ConnectionInterface $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductTableMap::DATABASE_NAME);
+        }
+
+        if ($criteria instanceof Criteria) {
+            $criteria = clone $criteria; // rename for clarity
+        } else {
+            $criteria = $criteria->buildCriteria(); // build Criteria from OrderProduct object
+        }
+
+        if ($criteria->containsKey(OrderProductTableMap::ID) && $criteria->keyContainsValue(OrderProductTableMap::ID) ) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key ('.OrderProductTableMap::ID.')');
+        }
+
+
+        // Set the correct dbName
+        $query = OrderProductQuery::create()->mergeWith($criteria);
+
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table (I guess, conceivably)
+            $con->beginTransaction();
+            $pk = $query->doInsert($con);
+            $con->commit();
+        } catch (PropelException $e) {
+            $con->rollBack();
+            throw $e;
+        }
+
+        return $pk;
+    }
+
+} // OrderProductTableMap
+// This is the static code needed to register the TableMap for this table with the main Propel class.
+//
+OrderProductTableMap::buildTableMap();
diff --git a/core/lib/Thelia/Model/Order.php b/core/lib/Thelia/Model/Order.php
index c5d03b7e7..f730c8853 100755
--- a/core/lib/Thelia/Model/Order.php
+++ b/core/lib/Thelia/Model/Order.php
@@ -3,9 +3,12 @@
 namespace Thelia\Model;
 
 use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Propel;
 use Thelia\Core\Event\OrderEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Base\Order as BaseOrder;
+use Thelia\Model\Map\OrderTableMap;
+use \PDO;
 
 class Order extends BaseOrder
 {
@@ -19,11 +22,19 @@ class Order extends BaseOrder
      */
     public function preInsert(ConnectionInterface $con = null)
     {
-        $this->dispatchEvent(TheliaEvents::ORDER_SET_REFERENCE, new OrderEvent($this));
+        $this->dispatchEvent(TheliaEvents::ORDER_BEFORE_CREATE, new OrderEvent($this));
 
         return true;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public function postInsert(ConnectionInterface $con = null)
+    {
+        $this->dispatchEvent(TheliaEvents::ORDER_AFTER_CREATE, new OrderEvent($this));
+    }
+
     /**
      * calculate the total amount
      *
@@ -35,4 +46,171 @@ class Order extends BaseOrder
     {
         return 2;
     }
+
+    /**
+     * PROPEL SHOULD FIX IT
+     *
+     * Insert the row in the database.
+     *
+     * @param      ConnectionInterface $con
+     *
+     * @throws PropelException
+     * @see doSave()
+     */
+    protected function doInsert(ConnectionInterface $con)
+    {
+        $modifiedColumns = array();
+        $index = 0;
+
+        $this->modifiedColumns[] = OrderTableMap::ID;
+        if (null !== $this->id) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key (' . OrderTableMap::ID . ')');
+        }
+
+        // check the columns in natural order for more readable SQL queries
+        if ($this->isColumnModified(OrderTableMap::ID)) {
+            $modifiedColumns[':p' . $index++]  = 'ID';
+        }
+        if ($this->isColumnModified(OrderTableMap::REF)) {
+            $modifiedColumns[':p' . $index++]  = 'REF';
+        }
+        if ($this->isColumnModified(OrderTableMap::CUSTOMER_ID)) {
+            $modifiedColumns[':p' . $index++]  = 'CUSTOMER_ID';
+        }
+        if ($this->isColumnModified(OrderTableMap::INVOICE_ORDER_ADDRESS_ID)) {
+            $modifiedColumns[':p' . $index++]  = 'INVOICE_ORDER_ADDRESS_ID';
+        }
+        if ($this->isColumnModified(OrderTableMap::DELIVERY_ORDER_ADDRESS_ID)) {
+            $modifiedColumns[':p' . $index++]  = 'DELIVERY_ORDER_ADDRESS_ID';
+        }
+        if ($this->isColumnModified(OrderTableMap::INVOICE_DATE)) {
+            $modifiedColumns[':p' . $index++]  = 'INVOICE_DATE';
+        }
+        if ($this->isColumnModified(OrderTableMap::CURRENCY_ID)) {
+            $modifiedColumns[':p' . $index++]  = 'CURRENCY_ID';
+        }
+        if ($this->isColumnModified(OrderTableMap::CURRENCY_RATE)) {
+            $modifiedColumns[':p' . $index++]  = 'CURRENCY_RATE';
+        }
+        if ($this->isColumnModified(OrderTableMap::TRANSACTION_REF)) {
+            $modifiedColumns[':p' . $index++]  = 'TRANSACTION_REF';
+        }
+        if ($this->isColumnModified(OrderTableMap::DELIVERY_REF)) {
+            $modifiedColumns[':p' . $index++]  = 'DELIVERY_REF';
+        }
+        if ($this->isColumnModified(OrderTableMap::INVOICE_REF)) {
+            $modifiedColumns[':p' . $index++]  = 'INVOICE_REF';
+        }
+        if ($this->isColumnModified(OrderTableMap::POSTAGE)) {
+            $modifiedColumns[':p' . $index++]  = 'POSTAGE';
+        }
+        if ($this->isColumnModified(OrderTableMap::PAYMENT_MODULE_ID)) {
+            $modifiedColumns[':p' . $index++]  = 'PAYMENT_MODULE_ID';
+        }
+        if ($this->isColumnModified(OrderTableMap::DELIVERY_MODULE_ID)) {
+            $modifiedColumns[':p' . $index++]  = 'DELIVERY_MODULE_ID';
+        }
+        if ($this->isColumnModified(OrderTableMap::STATUS_ID)) {
+            $modifiedColumns[':p' . $index++]  = 'STATUS_ID';
+        }
+        if ($this->isColumnModified(OrderTableMap::LANG_ID)) {
+            $modifiedColumns[':p' . $index++]  = 'LANG_ID';
+        }
+        if ($this->isColumnModified(OrderTableMap::CREATED_AT)) {
+            $modifiedColumns[':p' . $index++]  = 'CREATED_AT';
+        }
+        if ($this->isColumnModified(OrderTableMap::UPDATED_AT)) {
+            $modifiedColumns[':p' . $index++]  = 'UPDATED_AT';
+        }
+
+        $db = Propel::getServiceContainer()->getAdapter(OrderTableMap::DATABASE_NAME);
+
+        if ($db->useQuoteIdentifier()) {
+            $tableName = $db->quoteIdentifierTable(OrderTableMap::TABLE_NAME);
+        } else {
+            $tableName = OrderTableMap::TABLE_NAME;
+        }
+
+        $sql = sprintf(
+            'INSERT INTO %s (%s) VALUES (%s)',
+            $tableName,
+            implode(', ', $modifiedColumns),
+            implode(', ', array_keys($modifiedColumns))
+        );
+
+        try {
+            $stmt = $con->prepare($sql);
+            foreach ($modifiedColumns as $identifier => $columnName) {
+                switch ($columnName) {
+                    case 'ID':
+                        $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
+                        break;
+                    case 'REF':
+                        $stmt->bindValue($identifier, $this->ref, PDO::PARAM_STR);
+                        break;
+                    case 'CUSTOMER_ID':
+                        $stmt->bindValue($identifier, $this->customer_id, PDO::PARAM_INT);
+                        break;
+                    case 'INVOICE_ORDER_ADDRESS_ID':
+                        $stmt->bindValue($identifier, $this->invoice_order_address_id, PDO::PARAM_INT);
+                        break;
+                    case 'DELIVERY_ORDER_ADDRESS_ID':
+                        $stmt->bindValue($identifier, $this->delivery_order_address_id, PDO::PARAM_INT);
+                        break;
+                    case 'INVOICE_DATE':
+                        $stmt->bindValue($identifier, $this->invoice_date ? $this->invoice_date->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
+                        break;
+                    case 'CURRENCY_ID':
+                        $stmt->bindValue($identifier, $this->currency_id, PDO::PARAM_INT);
+                        break;
+                    case 'CURRENCY_RATE':
+                        $stmt->bindValue($identifier, $this->currency_rate, PDO::PARAM_STR);
+                        break;
+                    case 'TRANSACTION_REF':
+                        $stmt->bindValue($identifier, $this->transaction_ref, PDO::PARAM_STR);
+                        break;
+                    case 'DELIVERY_REF':
+                        $stmt->bindValue($identifier, $this->delivery_ref, PDO::PARAM_STR);
+                        break;
+                    case 'INVOICE_REF':
+                        $stmt->bindValue($identifier, $this->invoice_ref, PDO::PARAM_STR);
+                        break;
+                    case 'POSTAGE':
+                        $stmt->bindValue($identifier, $this->postage, PDO::PARAM_STR);
+                        break;
+                    case 'PAYMENT_MODULE_ID':
+                        $stmt->bindValue($identifier, $this->payment_module_id, PDO::PARAM_INT);
+                        break;
+                    case 'DELIVERY_MODULE_ID':
+                        $stmt->bindValue($identifier, $this->delivery_module_id, PDO::PARAM_INT);
+                        break;
+                    case 'STATUS_ID':
+                        $stmt->bindValue($identifier, $this->status_id, PDO::PARAM_INT);
+                        break;
+                    case 'LANG_ID':
+                        $stmt->bindValue($identifier, $this->lang_id, PDO::PARAM_INT);
+                        break;
+                    case 'CREATED_AT':
+                        $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
+                        break;
+                    case 'UPDATED_AT':
+                        $stmt->bindValue($identifier, $this->updated_at ? $this->updated_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
+                        break;
+                }
+            }
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e);
+        }
+
+        try {
+            $pk = $con->lastInsertId();
+        } catch (Exception $e) {
+            throw new PropelException('Unable to get autoincrement id.', 0, $e);
+        }
+        $this->setId($pk);
+
+        $this->setNew(false);
+    }
 }
diff --git a/core/lib/Thelia/Model/OrderProduct.php b/core/lib/Thelia/Model/OrderProduct.php
new file mode 100644
index 000000000..235eaf259
--- /dev/null
+++ b/core/lib/Thelia/Model/OrderProduct.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Thelia\Model;
+
+use Propel\Runtime\Connection\ConnectionInterface;
+use Thelia\Core\Event\OrderEvent;
+use Thelia\Core\Event\TheliaEvents;
+use Thelia\Model\Base\OrderProduct as BaseOrderProduct;
+
+class OrderProduct extends BaseOrderProduct
+{
+    use \Thelia\Model\Tools\ModelEventDispatcherTrait;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function preInsert(ConnectionInterface $con = null)
+    {
+        $this->dispatchEvent(TheliaEvents::ORDER_PRODUCT_BEFORE_CREATE, new OrderEvent($this->getOrder()));
+
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function postInsert(ConnectionInterface $con = null)
+    {
+        $this->dispatchEvent(TheliaEvents::ORDER_PRODUCT_AFTER_CREATE, new OrderEvent($this->getOrder()));
+    }
+}
diff --git a/core/lib/Thelia/Model/OrderProductQuery.php b/core/lib/Thelia/Model/OrderProductQuery.php
new file mode 100644
index 000000000..de2c22404
--- /dev/null
+++ b/core/lib/Thelia/Model/OrderProductQuery.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Thelia\Model;
+
+use Thelia\Model\Base\OrderProductQuery as BaseOrderProductQuery;
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'order_product' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class OrderProductQuery extends BaseOrderProductQuery
+{
+
+} // OrderProductQuery

From 2959c37c2db3d0d3c80557493fbcfb81cd55adde Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Thu, 19 Sep 2013 20:07:00 +0200
Subject: [PATCH 32/51] order payment email

---
 core/lib/Thelia/Action/Order.php            | 22 +++++++++++++++++----
 core/lib/Thelia/Core/Event/TheliaEvents.php |  2 ++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php
index fda052316..6cf9ff277 100755
--- a/core/lib/Thelia/Action/Order.php
+++ b/core/lib/Thelia/Action/Order.php
@@ -247,10 +247,15 @@ class Order extends BaseAction implements EventSubscriberInterface
 
         $con->commit();
 
-        /* T1style : dispatch mail event ? */
+        $this->getDispatcher()->dispatch(TheliaEvents::ORDER_BEFORE_PAYMENT, new OrderEvent($placedOrder));
 
-        /* clear session @todo : remove comment below + test */
-        //$sessionOrder = new \Thelia\Model\Order();
+        /* clear session */
+        $sessionOrder = new \Thelia\Model\Order();
+        $event->setOrder($sessionOrder);
+        $this->getSession()->setOrder($sessionOrder);
+
+        /* empty cart */
+        $this->getSession()->getCart()->clear();
 
         /* call pay method */
         $paymentModuleReflection = new \ReflectionClass($paymentModule->getFullNamespace());
@@ -259,7 +264,15 @@ class Order extends BaseAction implements EventSubscriberInterface
         $paymentModuleInstance->setRequest($this->getRequest());
         $paymentModuleInstance->setDispatcher($this->getDispatcher());
 
-        $paymentModuleInstance->pay();
+        $paymentModuleInstance->pay($placedOrder);
+    }
+
+    /**
+     * @param \Thelia\Core\Event\OrderEvent $event
+     */
+    public function sendOrderEmail(OrderEvent $event)
+    {
+        /* @todo */
     }
 
     /**
@@ -305,6 +318,7 @@ class Order extends BaseAction implements EventSubscriberInterface
             TheliaEvents::ORDER_SET_PAYMENT_MODULE => array("setPaymentModule", 128),
             TheliaEvents::ORDER_PAY => array("create", 128),
             TheliaEvents::ORDER_BEFORE_CREATE => array("setReference", 128),
+            TheliaEvents::ORDER_BEFORE_PAYMENT => array("sendOrderEmail", 128),
         );
     }
 
diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php
index 80d87cc8c..0c2bfcf72 100755
--- a/core/lib/Thelia/Core/Event/TheliaEvents.php
+++ b/core/lib/Thelia/Core/Event/TheliaEvents.php
@@ -222,6 +222,8 @@ final class TheliaEvents
     const ORDER_PAY = "action.order.pay";
     const ORDER_BEFORE_CREATE = "action.order.beforeCreate";
     const ORDER_AFTER_CREATE = "action.order.afterCreate";
+    const ORDER_BEFORE_PAYMENT = "action.order.beforePayment";
+
     const ORDER_PRODUCT_BEFORE_CREATE = "action.orderProduct.beforeCreate";
     const ORDER_PRODUCT_AFTER_CREATE = "action.orderProduct.afterCreate";
 

From 24f17bcb0fcc7660238344f555c0f64124d8c1c0 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Thu, 19 Sep 2013 20:24:33 +0200
Subject: [PATCH 33/51] fix count child on folder and category folder. Doubitch

---
 core/lib/Thelia/Core/Template/Loop/Category.php   |  3 ++-
 core/lib/Thelia/Core/Template/Loop/Folder.php     |  3 ++-
 core/lib/Thelia/Model/Tools/UrlRewritingTrait.php |  5 ++++-
 templates/default/category.html                   | 15 ++++++++++-----
 templates/default/includes/category-toolbar.html  |  4 ++--
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Loop/Category.php b/core/lib/Thelia/Core/Template/Loop/Category.php
index bd1c32de2..df993c62d 100755
--- a/core/lib/Thelia/Core/Template/Loop/Category.php
+++ b/core/lib/Thelia/Core/Template/Loop/Category.php
@@ -206,7 +206,8 @@ class Category extends BaseI18nLoop
                 ->set("POSTSCRIPTUM", $category->getVirtualColumn('i18n_POSTSCRIPTUM'))
                 ->set("PARENT", $category->getParent())
                 ->set("URL", $category->getUrl($locale))
-                ->set("PRODUCT_COUNT", $category->countChild())
+                ->set("PRODUCT_COUNT", $category->countAllProducts())
+                ->set("CHILD_COUNT", $category->getCount())
                 ->set("VISIBLE", $category->getVisible() ? "1" : "0")
                 ->set("POSITION", $category->getPosition())
 
diff --git a/core/lib/Thelia/Core/Template/Loop/Folder.php b/core/lib/Thelia/Core/Template/Loop/Folder.php
index cfd54db4f..5c56dff94 100755
--- a/core/lib/Thelia/Core/Template/Loop/Folder.php
+++ b/core/lib/Thelia/Core/Template/Loop/Folder.php
@@ -162,7 +162,8 @@ class Folder extends BaseI18nLoop
                 ->set("POSTSCRIPTUM", $folder->getVirtualColumn('i18n_POSTSCRIPTUM'))
                 ->set("PARENT", $folder->getParent())
                 ->set("URL", $folder->getUrl($locale))
-                ->set("CONTENT_COUNT", $folder->countChild())
+                ->set("CHILD_COUNT", $folder->countChild())
+                ->set("CONTENT_COUNT", $folder->countAllContents())
                 ->set("VISIBLE", $folder->getVisible() ? "1" : "0")
                 ->set("POSITION", $folder->getPosition())
             ;
diff --git a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
index 19947efa6..0a8af40c8 100644
--- a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
+++ b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
@@ -44,8 +44,11 @@ trait UrlRewritingTrait {
      *
      * @param string $locale a valid locale (e.g. en_US)
      */
-    public function getUrl($locale)
+    public function getUrl($locale = null)
     {
+        if(null === $locale) {
+            $locale = $this->getLocale();
+        }
         return URL::getInstance()->retrieve($this->getRewrittenUrlViewName(), $this->getId(), $locale)->toString();
     }
 
diff --git a/templates/default/category.html b/templates/default/category.html
index 153dafc9d..ba1574072 100644
--- a/templates/default/category.html
+++ b/templates/default/category.html
@@ -77,16 +77,16 @@
                                     {if $IS_PROMO }
                                         {loop name="productSaleElements_promo" type="product_sale_elements" product=$ID limit="1" order="min_price"}
                                          {assign var="default_product_sale_elements" value=$ID}
-                                        <span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number="{$TAXED_PROMO_PRICE}"} {currency attr="symbol"}</span></span>
-                                        <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number="{$TAXED_PRICE}"} {currency attr="symbol"}</span></span>
+                                        <span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number=$TAXED_PROMO_PRICE} {currency attr="symbol"}</span></span>
+                                        <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number=$TAXED_PRICE} {currency attr="symbol"}</span></span>
                                         {/loop}
                                     {else}
-                                        <span class="regular-price"><span itemprop="price" class="price">{format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"}</span></span>
+                                        <span class="regular-price"><span itemprop="price" class="price">{format_number number=$BEST_TAXED_PRICE} {currency attr="symbol"}</span></span>
                                     {/if}
 
                                 </div>
                                 <div class="product-btn">
-                                    <a class="btn btn-cart" href="#">Add to cart</a>
+                                    <button class="btn btn-cart">Add to cart</button>
                                 </div>
                             </div>
                         </article><!-- /product -->
@@ -101,9 +101,14 @@
         <aside class="col-left" role="complementary" itemscope itemtype="http://schema.org/WPSideBar">
 
             <section id="categories" class="block block-nav" role="navigation" aria-labelledby="categories-label">
-                <div class="block-heading"><h3 class="block-title" id="categories-label">Categories</h3></div>
+                <div class="block-heading"><h3 class="block-title" id="categories-label">{intl l="Categories"}</h3></div>
                 <div class="block-content">
                     <nav class="nav-categories">
+                        {loop name="cat-parent" type="category-tree" category="0"}
+                            <option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px" >{$LEVEL} {$ID} {$PARENT} {$TITLE}</option>
+                        {/loop}
+
+
                         <ul id="category" class="accordion">
                             <li>
                                 <a class="accordion-toggle" data-toggle="collapse" data-parent="#category" href="#collapse1">Category 1 <span class="amount">(3)</span></a>
diff --git a/templates/default/includes/category-toolbar.html b/templates/default/includes/category-toolbar.html
index 59a78151e..98ce01434 100644
--- a/templates/default/includes/category-toolbar.html
+++ b/templates/default/includes/category-toolbar.html
@@ -28,7 +28,7 @@
             </span><!-- /.sort-by -->
 
             <span class="view-mode">
-                <span class="view-mode-label">View as:</span>
+                <span class="view-mode-label">{intl l="View as"}:</span>
                 <span class="view-mode-btn">
                     <a href="?mode=grid" data-toggle="view" role="button" class="btn btn-grid"><i class="icon-grid"></i></a>
                     <a href="?mode=list" data-toggle="view" role="button" class="btn btn-list "><i class="icon-list"></i></a>
@@ -38,7 +38,7 @@
     </div><!-- /.sorter -->
 
     <div class="pagination-container" role="pagination" aria-labelledby="pagination-label-{$toolbar}">
-        <strong id="pagination-label-{$toolbar}" class="pagination-label">Pagination</strong>
+        <strong id="pagination-label-{$toolbar}" class="pagination-label">{intl l="Pagination"}</strong>
         <ul class="pagination">
             <li><a href="?page=<?php echo $page-1; ?>" class="prev"><i class="icon-prev"></i></a></li>
             <li class="active"><a href="?page=1" tabindex="-1"'; >1</a></li>

From acffa60e50e1f084eef2638da23c99b6ab02d5ad Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 20 Sep 2013 08:05:44 +0200
Subject: [PATCH 34/51] awesome menu created in front office

---
 .../Thelia/Core/Template/Loop/Category.php    |  2 +-
 .../Core/Template/Loop/CategoryTree.php       |  7 +--
 templates/default/category.html               | 43 +++++++------------
 3 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Loop/Category.php b/core/lib/Thelia/Core/Template/Loop/Category.php
index df993c62d..7a0bac76d 100755
--- a/core/lib/Thelia/Core/Template/Loop/Category.php
+++ b/core/lib/Thelia/Core/Template/Loop/Category.php
@@ -207,7 +207,7 @@ class Category extends BaseI18nLoop
                 ->set("PARENT", $category->getParent())
                 ->set("URL", $category->getUrl($locale))
                 ->set("PRODUCT_COUNT", $category->countAllProducts())
-                ->set("CHILD_COUNT", $category->getCount())
+                ->set("CHILD_COUNT", $category->countChild())
                 ->set("VISIBLE", $category->getVisible() ? "1" : "0")
                 ->set("POSITION", $category->getPosition())
 
diff --git a/core/lib/Thelia/Core/Template/Loop/CategoryTree.php b/core/lib/Thelia/Core/Template/Loop/CategoryTree.php
index 712767954..009e2204f 100755
--- a/core/lib/Thelia/Core/Template/Loop/CategoryTree.php
+++ b/core/lib/Thelia/Core/Template/Loop/CategoryTree.php
@@ -59,7 +59,7 @@ class CategoryTree extends BaseI18nLoop
     }
 
     // changement de rubrique
-    protected function buildCategoryTree($parent, $visible, $level, $max_level, $exclude, LoopResult &$loopResult)
+    protected function buildCategoryTree($parent, $visible, $level, $previousLevel, $max_level, $exclude, LoopResult &$loopResult)
     {
         if ($level > $max_level) return;
 
@@ -87,11 +87,12 @@ class CategoryTree extends BaseI18nLoop
                 ->set("ID", $result->getId())->set("TITLE", $result->getVirtualColumn('i18n_TITLE'))
                 ->set("PARENT", $result->getParent())->set("URL", $result->getUrl($locale))
                 ->set("VISIBLE", $result->getVisible() ? "1" : "0")->set("LEVEL", $level)
+                ->set('CHILD_COUNT', $result->countChild())->set('PREV_LEVEL', $previousLevel)
             ;
 
             $loopResult->addRow($loopResultRow);
 
-            $this->buildCategoryTree($result->getId(), $visible, 1 + $level, $max_level, $exclude, $loopResult);
+            $this->buildCategoryTree($result->getId(), $visible, 1 + $level, $level, $max_level, $exclude, $loopResult);
         }
     }
 
@@ -109,7 +110,7 @@ class CategoryTree extends BaseI18nLoop
 
         $loopResult = new LoopResult();
 
-        $this->buildCategoryTree($id, $visible, 0, $depth, $exclude, $loopResult);
+        $this->buildCategoryTree($id, $visible, 0, 0, $depth, $exclude, $loopResult);
 
         return $loopResult;
     }
diff --git a/templates/default/category.html b/templates/default/category.html
index ba1574072..c75bd2159 100644
--- a/templates/default/category.html
+++ b/templates/default/category.html
@@ -104,38 +104,25 @@
                 <div class="block-heading"><h3 class="block-title" id="categories-label">{intl l="Categories"}</h3></div>
                 <div class="block-content">
                     <nav class="nav-categories">
-                        {loop name="cat-parent" type="category-tree" category="0"}
-                            <option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px" >{$LEVEL} {$ID} {$PARENT} {$TITLE}</option>
-                        {/loop}
-
-
                         <ul id="category" class="accordion">
-                            <li>
-                                <a class="accordion-toggle" data-toggle="collapse" data-parent="#category" href="#collapse1">Category 1 <span class="amount">(3)</span></a>
-                                <ul id="collapse1" class="in">
-                                    <li>
-                                        <a href="#collapse11" class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#collapse1">Category 1.1 <span class="amount">(3)</span></a>
-                                        <ul id="collapse11" class="collapse">
-                                            <li><a href="#">Category 1.1.1 <span class="amount">(0)</span></a></li>
-                                            <li>
-                                                <a href="#collapse112" class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#collapse11">Category 1.1.2 <span class="amount">(2)</span></a>
-                                                <ul id="collapse112" class="collapse">
-                                                    <li><a href="#">Category 1.1.2.1 <span class="amount">(0)</span></a></li>
-                                                    <li><a href="#">Category 1.1.2.2 <span class="amount">(0)</span></a></li>
-                                                </ul>
+                            {assign "previousLevel" 0}
+                            {loop name="cat-parent" type="category-tree" category="0"}
 
-                                            </li>
-                                            <li><a href="#">Category 1.1.3 <span class="amount">(0)</span></a></li>
+                                {for $foo=1 to $previousLevel-$LEVEL}
                                         </ul>
-
                                     </li>
-                                    <li><a href="#">Category 1.2 <span class="amount">(0)</span></a></li>
-                                    <li><a href="#">Category 1.3 <span class="amount">(0)</span></a></li>
-                                </ul>
-                            </li>
-                            <li><a href="#">Category 2 <span class="amount">(0)</span></a></li>
-                            <li><a href="#">Category 3 <span class="amount">(0)</span></a></li>
-                            <li><a href="#">Category 4 <span class="amount">(0)</span></a></li>
+                                {/for}
+
+                                    {if $CHILD_COUNT > 0 }
+                                    <li><a class="accordion-toggle" data-toggle="collapse" data-parent="#category" href="#collapse{$ID}">{$TITLE}<span class="amount">({$CHILD_COUNT})</span></a>
+
+                                        <ul id="collapse{$ID}" class="collapse">
+                                    {else}
+
+                                        <li><a href="#">{$TITLE}<span class="amount">(0)</span></a></li>
+                                    {/if}
+                                {assign "previousLevel" $LEVEL}
+                            {/loop}
                         </ul>
                     </nav>
                 </div>

From 17548e352695832a4b24f82378e6049387d90fe7 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Fri, 20 Sep 2013 08:23:02 +0200
Subject: [PATCH 35/51] order tax tables

---
 core/lib/Thelia/Action/Order.php              |    6 +-
 .../Model/Base/OrderAttributeCombination.php  | 1824 -----------------
 .../Base/OrderAttributeCombinationQuery.php   |  897 --------
 core/lib/Thelia/Model/Base/OrderProduct.php   |  620 ++++--
 .../Thelia/Model/Base/OrderProductQuery.php   |  198 +-
 .../Map/OrderAttributeCombinationTableMap.php |  503 -----
 .../Thelia/Model/Map/OrderProductTableMap.php |   52 +-
 core/lib/Thelia/Model/Map/TaxI18nTableMap.php |    2 +-
 .../Thelia/Model/Map/TaxRuleI18nTableMap.php  |    2 +-
 .../Model/OrderAttributeCombination.php       |   10 -
 .../Model/OrderAttributeCombinationQuery.php  |   21 -
 install/thelia.sql                            |   41 +-
 local/config/schema.xml                       |   27 +-
 13 files changed, 712 insertions(+), 3491 deletions(-)
 delete mode 100644 core/lib/Thelia/Model/Base/OrderAttributeCombination.php
 delete mode 100644 core/lib/Thelia/Model/Base/OrderAttributeCombinationQuery.php
 delete mode 100644 core/lib/Thelia/Model/Map/OrderAttributeCombinationTableMap.php
 delete mode 100644 core/lib/Thelia/Model/OrderAttributeCombination.php
 delete mode 100644 core/lib/Thelia/Model/OrderAttributeCombinationQuery.php

diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php
index 6cf9ff277..17d8327c0 100755
--- a/core/lib/Thelia/Action/Order.php
+++ b/core/lib/Thelia/Action/Order.php
@@ -25,7 +25,6 @@ namespace Thelia\Action;
 
 use Propel\Runtime\ActiveQuery\ModelCriteria;
 use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
-use Propel\Runtime\Exception\PropelException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Thelia\Core\Event\OrderEvent;
@@ -35,9 +34,8 @@ use Thelia\Model\AttributeAvI18n;
 use Thelia\Model\AttributeAvI18nQuery;
 use Thelia\Model\AttributeI18n;
 use Thelia\Model\AttributeI18nQuery;
-use Thelia\Model\AttributeQuery;
 use Thelia\Model\AddressQuery;
-use Thelia\Model\OrderAttributeCombination;
+use Thelia\Model\OrderProductAttributeCombination;
 use Thelia\Model\ProductI18nQuery;
 use Thelia\Model\Lang;
 use Thelia\Model\ModuleQuery;
@@ -226,7 +224,7 @@ class Order extends BaseAction implements EventSubscriberInterface
                 $attribute = $this->getI18n(AttributeI18nQuery::create(), new AttributeI18n(), $attributeCombination->getAttributeId());
                 $attributeAv = $this->getI18n(AttributeAvI18nQuery::create(), new AttributeAvI18n(), $attributeCombination->getAttributeAvId());
 
-                $orderAttributeCombination = new OrderAttributeCombination();
+                $orderAttributeCombination = new OrderProductAttributeCombination();
                 $orderAttributeCombination
                     ->setOrderProductId($orderProduct->getId())
                     ->setAttributeTitle($attribute->getTitle())
diff --git a/core/lib/Thelia/Model/Base/OrderAttributeCombination.php b/core/lib/Thelia/Model/Base/OrderAttributeCombination.php
deleted file mode 100644
index 09bd77c28..000000000
--- a/core/lib/Thelia/Model/Base/OrderAttributeCombination.php
+++ /dev/null
@@ -1,1824 +0,0 @@
-<?php
-
-namespace Thelia\Model\Base;
-
-use \DateTime;
-use \Exception;
-use \PDO;
-use Propel\Runtime\Propel;
-use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\ModelCriteria;
-use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
-use Propel\Runtime\Collection\Collection;
-use Propel\Runtime\Connection\ConnectionInterface;
-use Propel\Runtime\Exception\BadMethodCallException;
-use Propel\Runtime\Exception\PropelException;
-use Propel\Runtime\Map\TableMap;
-use Propel\Runtime\Parser\AbstractParser;
-use Propel\Runtime\Util\PropelDateTime;
-use Thelia\Model\OrderAttributeCombination as ChildOrderAttributeCombination;
-use Thelia\Model\OrderAttributeCombinationQuery as ChildOrderAttributeCombinationQuery;
-use Thelia\Model\OrderProduct as ChildOrderProduct;
-use Thelia\Model\OrderProductQuery as ChildOrderProductQuery;
-use Thelia\Model\Map\OrderAttributeCombinationTableMap;
-
-abstract class OrderAttributeCombination implements ActiveRecordInterface
-{
-    /**
-     * TableMap class name
-     */
-    const TABLE_MAP = '\\Thelia\\Model\\Map\\OrderAttributeCombinationTableMap';
-
-
-    /**
-     * attribute to determine if this object has previously been saved.
-     * @var boolean
-     */
-    protected $new = true;
-
-    /**
-     * attribute to determine whether this object has been deleted.
-     * @var boolean
-     */
-    protected $deleted = false;
-
-    /**
-     * The columns that have been modified in current object.
-     * Tracking modified columns allows us to only update modified columns.
-     * @var array
-     */
-    protected $modifiedColumns = array();
-
-    /**
-     * The (virtual) columns that are added at runtime
-     * The formatters can add supplementary columns based on a resultset
-     * @var array
-     */
-    protected $virtualColumns = array();
-
-    /**
-     * The value for the id field.
-     * @var        int
-     */
-    protected $id;
-
-    /**
-     * The value for the order_product_id field.
-     * @var        int
-     */
-    protected $order_product_id;
-
-    /**
-     * The value for the attribute_title field.
-     * @var        string
-     */
-    protected $attribute_title;
-
-    /**
-     * The value for the attribute_chapo field.
-     * @var        string
-     */
-    protected $attribute_chapo;
-
-    /**
-     * The value for the attribute_description field.
-     * @var        string
-     */
-    protected $attribute_description;
-
-    /**
-     * The value for the attribute_postscriptumn field.
-     * @var        string
-     */
-    protected $attribute_postscriptumn;
-
-    /**
-     * The value for the attribute_av_title field.
-     * @var        string
-     */
-    protected $attribute_av_title;
-
-    /**
-     * The value for the attribute_av_chapo field.
-     * @var        string
-     */
-    protected $attribute_av_chapo;
-
-    /**
-     * The value for the attribute_av_description field.
-     * @var        string
-     */
-    protected $attribute_av_description;
-
-    /**
-     * The value for the attribute_av_postscriptum field.
-     * @var        string
-     */
-    protected $attribute_av_postscriptum;
-
-    /**
-     * The value for the created_at field.
-     * @var        string
-     */
-    protected $created_at;
-
-    /**
-     * The value for the updated_at field.
-     * @var        string
-     */
-    protected $updated_at;
-
-    /**
-     * @var        OrderProduct
-     */
-    protected $aOrderProduct;
-
-    /**
-     * Flag to prevent endless save loop, if this object is referenced
-     * by another object which falls in this transaction.
-     *
-     * @var boolean
-     */
-    protected $alreadyInSave = false;
-
-    /**
-     * Initializes internal state of Thelia\Model\Base\OrderAttributeCombination object.
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Returns whether the object has been modified.
-     *
-     * @return boolean True if the object has been modified.
-     */
-    public function isModified()
-    {
-        return !empty($this->modifiedColumns);
-    }
-
-    /**
-     * Has specified column been modified?
-     *
-     * @param  string  $col column fully qualified name (TableMap::TYPE_COLNAME), e.g. Book::AUTHOR_ID
-     * @return boolean True if $col has been modified.
-     */
-    public function isColumnModified($col)
-    {
-        return in_array($col, $this->modifiedColumns);
-    }
-
-    /**
-     * Get the columns that have been modified in this object.
-     * @return array A unique list of the modified column names for this object.
-     */
-    public function getModifiedColumns()
-    {
-        return array_unique($this->modifiedColumns);
-    }
-
-    /**
-     * Returns whether the object has ever been saved.  This will
-     * be false, if the object was retrieved from storage or was created
-     * and then saved.
-     *
-     * @return true, if the object has never been persisted.
-     */
-    public function isNew()
-    {
-        return $this->new;
-    }
-
-    /**
-     * Setter for the isNew attribute.  This method will be called
-     * by Propel-generated children and objects.
-     *
-     * @param boolean $b the state of the object.
-     */
-    public function setNew($b)
-    {
-        $this->new = (Boolean) $b;
-    }
-
-    /**
-     * Whether this object has been deleted.
-     * @return boolean The deleted state of this object.
-     */
-    public function isDeleted()
-    {
-        return $this->deleted;
-    }
-
-    /**
-     * Specify whether this object has been deleted.
-     * @param  boolean $b The deleted state of this object.
-     * @return void
-     */
-    public function setDeleted($b)
-    {
-        $this->deleted = (Boolean) $b;
-    }
-
-    /**
-     * Sets the modified state for the object to be false.
-     * @param  string $col If supplied, only the specified column is reset.
-     * @return void
-     */
-    public function resetModified($col = null)
-    {
-        if (null !== $col) {
-            while (false !== ($offset = array_search($col, $this->modifiedColumns))) {
-                array_splice($this->modifiedColumns, $offset, 1);
-            }
-        } else {
-            $this->modifiedColumns = array();
-        }
-    }
-
-    /**
-     * Compares this with another <code>OrderAttributeCombination</code> instance.  If
-     * <code>obj</code> is an instance of <code>OrderAttributeCombination</code>, delegates to
-     * <code>equals(OrderAttributeCombination)</code>.  Otherwise, returns <code>false</code>.
-     *
-     * @param      obj The object to compare to.
-     * @return Whether equal to the object specified.
-     */
-    public function equals($obj)
-    {
-        $thisclazz = get_class($this);
-        if (!is_object($obj) || !($obj instanceof $thisclazz)) {
-            return false;
-        }
-
-        if ($this === $obj) {
-            return true;
-        }
-
-        if (null === $this->getPrimaryKey()
-            || null === $obj->getPrimaryKey())  {
-            return false;
-        }
-
-        return $this->getPrimaryKey() === $obj->getPrimaryKey();
-    }
-
-    /**
-     * If the primary key is not null, return the hashcode of the
-     * primary key. Otherwise, return the hash code of the object.
-     *
-     * @return int Hashcode
-     */
-    public function hashCode()
-    {
-        if (null !== $this->getPrimaryKey()) {
-            return crc32(serialize($this->getPrimaryKey()));
-        }
-
-        return crc32(serialize(clone $this));
-    }
-
-    /**
-     * Get the associative array of the virtual columns in this object
-     *
-     * @param string $name The virtual column name
-     *
-     * @return array
-     */
-    public function getVirtualColumns()
-    {
-        return $this->virtualColumns;
-    }
-
-    /**
-     * Checks the existence of a virtual column in this object
-     *
-     * @return boolean
-     */
-    public function hasVirtualColumn($name)
-    {
-        return array_key_exists($name, $this->virtualColumns);
-    }
-
-    /**
-     * Get the value of a virtual column in this object
-     *
-     * @return mixed
-     */
-    public function getVirtualColumn($name)
-    {
-        if (!$this->hasVirtualColumn($name)) {
-            throw new PropelException(sprintf('Cannot get value of inexistent virtual column %s.', $name));
-        }
-
-        return $this->virtualColumns[$name];
-    }
-
-    /**
-     * Set the value of a virtual column in this object
-     *
-     * @param string $name  The virtual column name
-     * @param mixed  $value The value to give to the virtual column
-     *
-     * @return OrderAttributeCombination The current object, for fluid interface
-     */
-    public function setVirtualColumn($name, $value)
-    {
-        $this->virtualColumns[$name] = $value;
-
-        return $this;
-    }
-
-    /**
-     * Logs a message using Propel::log().
-     *
-     * @param  string  $msg
-     * @param  int     $priority One of the Propel::LOG_* logging levels
-     * @return boolean
-     */
-    protected function log($msg, $priority = Propel::LOG_INFO)
-    {
-        return Propel::log(get_class($this) . ': ' . $msg, $priority);
-    }
-
-    /**
-     * Populate the current object from a string, using a given parser format
-     * <code>
-     * $book = new Book();
-     * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
-     * </code>
-     *
-     * @param mixed $parser A AbstractParser instance,
-     *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
-     * @param string $data The source data to import from
-     *
-     * @return OrderAttributeCombination The current object, for fluid interface
-     */
-    public function importFrom($parser, $data)
-    {
-        if (!$parser instanceof AbstractParser) {
-            $parser = AbstractParser::getParser($parser);
-        }
-
-        return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME);
-    }
-
-    /**
-     * Export the current object properties to a string, using a given parser format
-     * <code>
-     * $book = BookQuery::create()->findPk(9012);
-     * echo $book->exportTo('JSON');
-     *  => {"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
-     * </code>
-     *
-     * @param  mixed   $parser                 A AbstractParser instance, or a format name ('XML', 'YAML', 'JSON', 'CSV')
-     * @param  boolean $includeLazyLoadColumns (optional) Whether to include lazy load(ed) columns. Defaults to TRUE.
-     * @return string  The exported data
-     */
-    public function exportTo($parser, $includeLazyLoadColumns = true)
-    {
-        if (!$parser instanceof AbstractParser) {
-            $parser = AbstractParser::getParser($parser);
-        }
-
-        return $parser->fromArray($this->toArray(TableMap::TYPE_PHPNAME, $includeLazyLoadColumns, array(), true));
-    }
-
-    /**
-     * Clean up internal collections prior to serializing
-     * Avoids recursive loops that turn into segmentation faults when serializing
-     */
-    public function __sleep()
-    {
-        $this->clearAllReferences();
-
-        return array_keys(get_object_vars($this));
-    }
-
-    /**
-     * Get the [id] column value.
-     *
-     * @return   int
-     */
-    public function getId()
-    {
-
-        return $this->id;
-    }
-
-    /**
-     * Get the [order_product_id] column value.
-     *
-     * @return   int
-     */
-    public function getOrderProductId()
-    {
-
-        return $this->order_product_id;
-    }
-
-    /**
-     * Get the [attribute_title] column value.
-     *
-     * @return   string
-     */
-    public function getAttributeTitle()
-    {
-
-        return $this->attribute_title;
-    }
-
-    /**
-     * Get the [attribute_chapo] column value.
-     *
-     * @return   string
-     */
-    public function getAttributeChapo()
-    {
-
-        return $this->attribute_chapo;
-    }
-
-    /**
-     * Get the [attribute_description] column value.
-     *
-     * @return   string
-     */
-    public function getAttributeDescription()
-    {
-
-        return $this->attribute_description;
-    }
-
-    /**
-     * Get the [attribute_postscriptumn] column value.
-     *
-     * @return   string
-     */
-    public function getAttributePostscriptumn()
-    {
-
-        return $this->attribute_postscriptumn;
-    }
-
-    /**
-     * Get the [attribute_av_title] column value.
-     *
-     * @return   string
-     */
-    public function getAttributeAvTitle()
-    {
-
-        return $this->attribute_av_title;
-    }
-
-    /**
-     * Get the [attribute_av_chapo] column value.
-     *
-     * @return   string
-     */
-    public function getAttributeAvChapo()
-    {
-
-        return $this->attribute_av_chapo;
-    }
-
-    /**
-     * Get the [attribute_av_description] column value.
-     *
-     * @return   string
-     */
-    public function getAttributeAvDescription()
-    {
-
-        return $this->attribute_av_description;
-    }
-
-    /**
-     * Get the [attribute_av_postscriptum] column value.
-     *
-     * @return   string
-     */
-    public function getAttributeAvPostscriptum()
-    {
-
-        return $this->attribute_av_postscriptum;
-    }
-
-    /**
-     * Get the [optionally formatted] temporal [created_at] column value.
-     *
-     *
-     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                            If format is NULL, then the raw \DateTime object will be returned.
-     *
-     * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
-     *
-     * @throws PropelException - if unable to parse/validate the date/time value.
-     */
-    public function getCreatedAt($format = NULL)
-    {
-        if ($format === null) {
-            return $this->created_at;
-        } else {
-            return $this->created_at !== null ? $this->created_at->format($format) : null;
-        }
-    }
-
-    /**
-     * Get the [optionally formatted] temporal [updated_at] column value.
-     *
-     *
-     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                            If format is NULL, then the raw \DateTime object will be returned.
-     *
-     * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
-     *
-     * @throws PropelException - if unable to parse/validate the date/time value.
-     */
-    public function getUpdatedAt($format = NULL)
-    {
-        if ($format === null) {
-            return $this->updated_at;
-        } else {
-            return $this->updated_at !== null ? $this->updated_at->format($format) : null;
-        }
-    }
-
-    /**
-     * Set the value of [id] column.
-     *
-     * @param      int $v new value
-     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
-     */
-    public function setId($v)
-    {
-        if ($v !== null) {
-            $v = (int) $v;
-        }
-
-        if ($this->id !== $v) {
-            $this->id = $v;
-            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ID;
-        }
-
-
-        return $this;
-    } // setId()
-
-    /**
-     * Set the value of [order_product_id] column.
-     *
-     * @param      int $v new value
-     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
-     */
-    public function setOrderProductId($v)
-    {
-        if ($v !== null) {
-            $v = (int) $v;
-        }
-
-        if ($this->order_product_id !== $v) {
-            $this->order_product_id = $v;
-            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID;
-        }
-
-        if ($this->aOrderProduct !== null && $this->aOrderProduct->getId() !== $v) {
-            $this->aOrderProduct = null;
-        }
-
-
-        return $this;
-    } // setOrderProductId()
-
-    /**
-     * Set the value of [attribute_title] column.
-     *
-     * @param      string $v new value
-     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
-     */
-    public function setAttributeTitle($v)
-    {
-        if ($v !== null) {
-            $v = (string) $v;
-        }
-
-        if ($this->attribute_title !== $v) {
-            $this->attribute_title = $v;
-            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE;
-        }
-
-
-        return $this;
-    } // setAttributeTitle()
-
-    /**
-     * Set the value of [attribute_chapo] column.
-     *
-     * @param      string $v new value
-     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
-     */
-    public function setAttributeChapo($v)
-    {
-        if ($v !== null) {
-            $v = (string) $v;
-        }
-
-        if ($this->attribute_chapo !== $v) {
-            $this->attribute_chapo = $v;
-            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO;
-        }
-
-
-        return $this;
-    } // setAttributeChapo()
-
-    /**
-     * Set the value of [attribute_description] column.
-     *
-     * @param      string $v new value
-     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
-     */
-    public function setAttributeDescription($v)
-    {
-        if ($v !== null) {
-            $v = (string) $v;
-        }
-
-        if ($this->attribute_description !== $v) {
-            $this->attribute_description = $v;
-            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION;
-        }
-
-
-        return $this;
-    } // setAttributeDescription()
-
-    /**
-     * Set the value of [attribute_postscriptumn] column.
-     *
-     * @param      string $v new value
-     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
-     */
-    public function setAttributePostscriptumn($v)
-    {
-        if ($v !== null) {
-            $v = (string) $v;
-        }
-
-        if ($this->attribute_postscriptumn !== $v) {
-            $this->attribute_postscriptumn = $v;
-            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN;
-        }
-
-
-        return $this;
-    } // setAttributePostscriptumn()
-
-    /**
-     * Set the value of [attribute_av_title] column.
-     *
-     * @param      string $v new value
-     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
-     */
-    public function setAttributeAvTitle($v)
-    {
-        if ($v !== null) {
-            $v = (string) $v;
-        }
-
-        if ($this->attribute_av_title !== $v) {
-            $this->attribute_av_title = $v;
-            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE;
-        }
-
-
-        return $this;
-    } // setAttributeAvTitle()
-
-    /**
-     * Set the value of [attribute_av_chapo] column.
-     *
-     * @param      string $v new value
-     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
-     */
-    public function setAttributeAvChapo($v)
-    {
-        if ($v !== null) {
-            $v = (string) $v;
-        }
-
-        if ($this->attribute_av_chapo !== $v) {
-            $this->attribute_av_chapo = $v;
-            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO;
-        }
-
-
-        return $this;
-    } // setAttributeAvChapo()
-
-    /**
-     * Set the value of [attribute_av_description] column.
-     *
-     * @param      string $v new value
-     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
-     */
-    public function setAttributeAvDescription($v)
-    {
-        if ($v !== null) {
-            $v = (string) $v;
-        }
-
-        if ($this->attribute_av_description !== $v) {
-            $this->attribute_av_description = $v;
-            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION;
-        }
-
-
-        return $this;
-    } // setAttributeAvDescription()
-
-    /**
-     * Set the value of [attribute_av_postscriptum] column.
-     *
-     * @param      string $v new value
-     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
-     */
-    public function setAttributeAvPostscriptum($v)
-    {
-        if ($v !== null) {
-            $v = (string) $v;
-        }
-
-        if ($this->attribute_av_postscriptum !== $v) {
-            $this->attribute_av_postscriptum = $v;
-            $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM;
-        }
-
-
-        return $this;
-    } // setAttributeAvPostscriptum()
-
-    /**
-     * Sets the value of [created_at] column to a normalized version of the date/time value specified.
-     *
-     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *               Empty strings are treated as NULL.
-     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
-     */
-    public function setCreatedAt($v)
-    {
-        $dt = PropelDateTime::newInstance($v, null, '\DateTime');
-        if ($this->created_at !== null || $dt !== null) {
-            if ($dt !== $this->created_at) {
-                $this->created_at = $dt;
-                $this->modifiedColumns[] = OrderAttributeCombinationTableMap::CREATED_AT;
-            }
-        } // if either are not null
-
-
-        return $this;
-    } // setCreatedAt()
-
-    /**
-     * Sets the value of [updated_at] column to a normalized version of the date/time value specified.
-     *
-     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *               Empty strings are treated as NULL.
-     * @return   \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
-     */
-    public function setUpdatedAt($v)
-    {
-        $dt = PropelDateTime::newInstance($v, null, '\DateTime');
-        if ($this->updated_at !== null || $dt !== null) {
-            if ($dt !== $this->updated_at) {
-                $this->updated_at = $dt;
-                $this->modifiedColumns[] = OrderAttributeCombinationTableMap::UPDATED_AT;
-            }
-        } // if either are not null
-
-
-        return $this;
-    } // setUpdatedAt()
-
-    /**
-     * Indicates whether the columns in this object are only set to default values.
-     *
-     * This method can be used in conjunction with isModified() to indicate whether an object is both
-     * modified _and_ has some values set which are non-default.
-     *
-     * @return boolean Whether the columns in this object are only been set with default values.
-     */
-    public function hasOnlyDefaultValues()
-    {
-        // otherwise, everything was equal, so return TRUE
-        return true;
-    } // hasOnlyDefaultValues()
-
-    /**
-     * Hydrates (populates) the object variables with values from the database resultset.
-     *
-     * An offset (0-based "start column") is specified so that objects can be hydrated
-     * with a subset of the columns in the resultset rows.  This is needed, for example,
-     * for results of JOIN queries where the resultset row includes columns from two or
-     * more tables.
-     *
-     * @param array   $row       The row returned by DataFetcher->fetch().
-     * @param int     $startcol  0-based offset column which indicates which restultset column to start with.
-     * @param boolean $rehydrate Whether this object is being re-hydrated from the database.
-     * @param string  $indexType The index type of $row. Mostly DataFetcher->getIndexType().
-                                  One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                            TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *
-     * @return int             next starting column
-     * @throws PropelException - Any caught Exception will be rewrapped as a PropelException.
-     */
-    public function hydrate($row, $startcol = 0, $rehydrate = false, $indexType = TableMap::TYPE_NUM)
-    {
-        try {
-
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->id = (null !== $col) ? (int) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('OrderProductId', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->order_product_id = (null !== $col) ? (int) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeTitle', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->attribute_title = (null !== $col) ? (string) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeChapo', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->attribute_chapo = (null !== $col) ? (string) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeDescription', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->attribute_description = (null !== $col) ? (string) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributePostscriptumn', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->attribute_postscriptumn = (null !== $col) ? (string) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeAvTitle', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->attribute_av_title = (null !== $col) ? (string) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeAvChapo', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->attribute_av_chapo = (null !== $col) ? (string) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeAvDescription', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->attribute_av_description = (null !== $col) ? (string) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeAvPostscriptum', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->attribute_av_postscriptum = (null !== $col) ? (string) $col : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
-            if ($col === '0000-00-00 00:00:00') {
-                $col = null;
-            }
-            $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
-
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
-            if ($col === '0000-00-00 00:00:00') {
-                $col = null;
-            }
-            $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
-            $this->resetModified();
-
-            $this->setNew(false);
-
-            if ($rehydrate) {
-                $this->ensureConsistency();
-            }
-
-            return $startcol + 12; // 12 = OrderAttributeCombinationTableMap::NUM_HYDRATE_COLUMNS.
-
-        } catch (Exception $e) {
-            throw new PropelException("Error populating \Thelia\Model\OrderAttributeCombination object", 0, $e);
-        }
-    }
-
-    /**
-     * Checks and repairs the internal consistency of the object.
-     *
-     * This method is executed after an already-instantiated object is re-hydrated
-     * from the database.  It exists to check any foreign keys to make sure that
-     * the objects related to the current object are correct based on foreign key.
-     *
-     * You can override this method in the stub class, but you should always invoke
-     * the base method from the overridden method (i.e. parent::ensureConsistency()),
-     * in case your model changes.
-     *
-     * @throws PropelException
-     */
-    public function ensureConsistency()
-    {
-        if ($this->aOrderProduct !== null && $this->order_product_id !== $this->aOrderProduct->getId()) {
-            $this->aOrderProduct = null;
-        }
-    } // ensureConsistency
-
-    /**
-     * Reloads this object from datastore based on primary key and (optionally) resets all associated objects.
-     *
-     * This will only work if the object has been saved and has a valid primary key set.
-     *
-     * @param      boolean $deep (optional) Whether to also de-associated any related objects.
-     * @param      ConnectionInterface $con (optional) The ConnectionInterface connection to use.
-     * @return void
-     * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db
-     */
-    public function reload($deep = false, ConnectionInterface $con = null)
-    {
-        if ($this->isDeleted()) {
-            throw new PropelException("Cannot reload a deleted object.");
-        }
-
-        if ($this->isNew()) {
-            throw new PropelException("Cannot reload an unsaved object.");
-        }
-
-        if ($con === null) {
-            $con = Propel::getServiceContainer()->getReadConnection(OrderAttributeCombinationTableMap::DATABASE_NAME);
-        }
-
-        // We don't need to alter the object instance pool; we're just modifying this instance
-        // already in the pool.
-
-        $dataFetcher = ChildOrderAttributeCombinationQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con);
-        $row = $dataFetcher->fetch();
-        $dataFetcher->close();
-        if (!$row) {
-            throw new PropelException('Cannot find matching row in the database to reload object values.');
-        }
-        $this->hydrate($row, 0, true, $dataFetcher->getIndexType()); // rehydrate
-
-        if ($deep) {  // also de-associate any related objects?
-
-            $this->aOrderProduct = null;
-        } // if (deep)
-    }
-
-    /**
-     * Removes this object from datastore and sets delete attribute.
-     *
-     * @param      ConnectionInterface $con
-     * @return void
-     * @throws PropelException
-     * @see OrderAttributeCombination::setDeleted()
-     * @see OrderAttributeCombination::isDeleted()
-     */
-    public function delete(ConnectionInterface $con = null)
-    {
-        if ($this->isDeleted()) {
-            throw new PropelException("This object has already been deleted.");
-        }
-
-        if ($con === null) {
-            $con = Propel::getServiceContainer()->getWriteConnection(OrderAttributeCombinationTableMap::DATABASE_NAME);
-        }
-
-        $con->beginTransaction();
-        try {
-            $deleteQuery = ChildOrderAttributeCombinationQuery::create()
-                ->filterByPrimaryKey($this->getPrimaryKey());
-            $ret = $this->preDelete($con);
-            if ($ret) {
-                $deleteQuery->delete($con);
-                $this->postDelete($con);
-                $con->commit();
-                $this->setDeleted(true);
-            } else {
-                $con->commit();
-            }
-        } catch (Exception $e) {
-            $con->rollBack();
-            throw $e;
-        }
-    }
-
-    /**
-     * Persists this object to the database.
-     *
-     * If the object is new, it inserts it; otherwise an update is performed.
-     * All modified related objects will also be persisted in the doSave()
-     * method.  This method wraps all precipitate database operations in a
-     * single transaction.
-     *
-     * @param      ConnectionInterface $con
-     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
-     * @throws PropelException
-     * @see doSave()
-     */
-    public function save(ConnectionInterface $con = null)
-    {
-        if ($this->isDeleted()) {
-            throw new PropelException("You cannot save an object that has been deleted.");
-        }
-
-        if ($con === null) {
-            $con = Propel::getServiceContainer()->getWriteConnection(OrderAttributeCombinationTableMap::DATABASE_NAME);
-        }
-
-        $con->beginTransaction();
-        $isInsert = $this->isNew();
-        try {
-            $ret = $this->preSave($con);
-            if ($isInsert) {
-                $ret = $ret && $this->preInsert($con);
-                // timestampable behavior
-                if (!$this->isColumnModified(OrderAttributeCombinationTableMap::CREATED_AT)) {
-                    $this->setCreatedAt(time());
-                }
-                if (!$this->isColumnModified(OrderAttributeCombinationTableMap::UPDATED_AT)) {
-                    $this->setUpdatedAt(time());
-                }
-            } else {
-                $ret = $ret && $this->preUpdate($con);
-                // timestampable behavior
-                if ($this->isModified() && !$this->isColumnModified(OrderAttributeCombinationTableMap::UPDATED_AT)) {
-                    $this->setUpdatedAt(time());
-                }
-            }
-            if ($ret) {
-                $affectedRows = $this->doSave($con);
-                if ($isInsert) {
-                    $this->postInsert($con);
-                } else {
-                    $this->postUpdate($con);
-                }
-                $this->postSave($con);
-                OrderAttributeCombinationTableMap::addInstanceToPool($this);
-            } else {
-                $affectedRows = 0;
-            }
-            $con->commit();
-
-            return $affectedRows;
-        } catch (Exception $e) {
-            $con->rollBack();
-            throw $e;
-        }
-    }
-
-    /**
-     * Performs the work of inserting or updating the row in the database.
-     *
-     * If the object is new, it inserts it; otherwise an update is performed.
-     * All related objects are also updated in this method.
-     *
-     * @param      ConnectionInterface $con
-     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
-     * @throws PropelException
-     * @see save()
-     */
-    protected function doSave(ConnectionInterface $con)
-    {
-        $affectedRows = 0; // initialize var to track total num of affected rows
-        if (!$this->alreadyInSave) {
-            $this->alreadyInSave = true;
-
-            // We call the save method on the following object(s) if they
-            // were passed to this object by their corresponding set
-            // method.  This object relates to these object(s) by a
-            // foreign key reference.
-
-            if ($this->aOrderProduct !== null) {
-                if ($this->aOrderProduct->isModified() || $this->aOrderProduct->isNew()) {
-                    $affectedRows += $this->aOrderProduct->save($con);
-                }
-                $this->setOrderProduct($this->aOrderProduct);
-            }
-
-            if ($this->isNew() || $this->isModified()) {
-                // persist changes
-                if ($this->isNew()) {
-                    $this->doInsert($con);
-                } else {
-                    $this->doUpdate($con);
-                }
-                $affectedRows += 1;
-                $this->resetModified();
-            }
-
-            $this->alreadyInSave = false;
-
-        }
-
-        return $affectedRows;
-    } // doSave()
-
-    /**
-     * Insert the row in the database.
-     *
-     * @param      ConnectionInterface $con
-     *
-     * @throws PropelException
-     * @see doSave()
-     */
-    protected function doInsert(ConnectionInterface $con)
-    {
-        $modifiedColumns = array();
-        $index = 0;
-
-        $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ID;
-        if (null !== $this->id) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key (' . OrderAttributeCombinationTableMap::ID . ')');
-        }
-
-         // check the columns in natural order for more readable SQL queries
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ID)) {
-            $modifiedColumns[':p' . $index++]  = 'ID';
-        }
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID)) {
-            $modifiedColumns[':p' . $index++]  = 'ORDER_PRODUCT_ID';
-        }
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE)) {
-            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_TITLE';
-        }
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO)) {
-            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_CHAPO';
-        }
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION)) {
-            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_DESCRIPTION';
-        }
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN)) {
-            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_POSTSCRIPTUMN';
-        }
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE)) {
-            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_AV_TITLE';
-        }
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO)) {
-            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_AV_CHAPO';
-        }
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION)) {
-            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_AV_DESCRIPTION';
-        }
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM)) {
-            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_AV_POSTSCRIPTUM';
-        }
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::CREATED_AT)) {
-            $modifiedColumns[':p' . $index++]  = 'CREATED_AT';
-        }
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::UPDATED_AT)) {
-            $modifiedColumns[':p' . $index++]  = 'UPDATED_AT';
-        }
-
-        $sql = sprintf(
-            'INSERT INTO order_attribute_combination (%s) VALUES (%s)',
-            implode(', ', $modifiedColumns),
-            implode(', ', array_keys($modifiedColumns))
-        );
-
-        try {
-            $stmt = $con->prepare($sql);
-            foreach ($modifiedColumns as $identifier => $columnName) {
-                switch ($columnName) {
-                    case 'ID':
-                        $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
-                        break;
-                    case 'ORDER_PRODUCT_ID':
-                        $stmt->bindValue($identifier, $this->order_product_id, PDO::PARAM_INT);
-                        break;
-                    case 'ATTRIBUTE_TITLE':
-                        $stmt->bindValue($identifier, $this->attribute_title, PDO::PARAM_STR);
-                        break;
-                    case 'ATTRIBUTE_CHAPO':
-                        $stmt->bindValue($identifier, $this->attribute_chapo, PDO::PARAM_STR);
-                        break;
-                    case 'ATTRIBUTE_DESCRIPTION':
-                        $stmt->bindValue($identifier, $this->attribute_description, PDO::PARAM_STR);
-                        break;
-                    case 'ATTRIBUTE_POSTSCRIPTUMN':
-                        $stmt->bindValue($identifier, $this->attribute_postscriptumn, PDO::PARAM_STR);
-                        break;
-                    case 'ATTRIBUTE_AV_TITLE':
-                        $stmt->bindValue($identifier, $this->attribute_av_title, PDO::PARAM_STR);
-                        break;
-                    case 'ATTRIBUTE_AV_CHAPO':
-                        $stmt->bindValue($identifier, $this->attribute_av_chapo, PDO::PARAM_STR);
-                        break;
-                    case 'ATTRIBUTE_AV_DESCRIPTION':
-                        $stmt->bindValue($identifier, $this->attribute_av_description, PDO::PARAM_STR);
-                        break;
-                    case 'ATTRIBUTE_AV_POSTSCRIPTUM':
-                        $stmt->bindValue($identifier, $this->attribute_av_postscriptum, PDO::PARAM_STR);
-                        break;
-                    case 'CREATED_AT':
-                        $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
-                        break;
-                    case 'UPDATED_AT':
-                        $stmt->bindValue($identifier, $this->updated_at ? $this->updated_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
-                        break;
-                }
-            }
-            $stmt->execute();
-        } catch (Exception $e) {
-            Propel::log($e->getMessage(), Propel::LOG_ERR);
-            throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e);
-        }
-
-        try {
-            $pk = $con->lastInsertId();
-        } catch (Exception $e) {
-            throw new PropelException('Unable to get autoincrement id.', 0, $e);
-        }
-        $this->setId($pk);
-
-        $this->setNew(false);
-    }
-
-    /**
-     * Update the row in the database.
-     *
-     * @param      ConnectionInterface $con
-     *
-     * @return Integer Number of updated rows
-     * @see doSave()
-     */
-    protected function doUpdate(ConnectionInterface $con)
-    {
-        $selectCriteria = $this->buildPkeyCriteria();
-        $valuesCriteria = $this->buildCriteria();
-
-        return $selectCriteria->doUpdate($valuesCriteria, $con);
-    }
-
-    /**
-     * Retrieves a field from the object by name passed in as a string.
-     *
-     * @param      string $name name
-     * @param      string $type The type of fieldname the $name is of:
-     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                     Defaults to TableMap::TYPE_PHPNAME.
-     * @return mixed Value of field.
-     */
-    public function getByName($name, $type = TableMap::TYPE_PHPNAME)
-    {
-        $pos = OrderAttributeCombinationTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
-        $field = $this->getByPosition($pos);
-
-        return $field;
-    }
-
-    /**
-     * Retrieves a field from the object by Position as specified in the xml schema.
-     * Zero-based.
-     *
-     * @param      int $pos position in xml schema
-     * @return mixed Value of field at $pos
-     */
-    public function getByPosition($pos)
-    {
-        switch ($pos) {
-            case 0:
-                return $this->getId();
-                break;
-            case 1:
-                return $this->getOrderProductId();
-                break;
-            case 2:
-                return $this->getAttributeTitle();
-                break;
-            case 3:
-                return $this->getAttributeChapo();
-                break;
-            case 4:
-                return $this->getAttributeDescription();
-                break;
-            case 5:
-                return $this->getAttributePostscriptumn();
-                break;
-            case 6:
-                return $this->getAttributeAvTitle();
-                break;
-            case 7:
-                return $this->getAttributeAvChapo();
-                break;
-            case 8:
-                return $this->getAttributeAvDescription();
-                break;
-            case 9:
-                return $this->getAttributeAvPostscriptum();
-                break;
-            case 10:
-                return $this->getCreatedAt();
-                break;
-            case 11:
-                return $this->getUpdatedAt();
-                break;
-            default:
-                return null;
-                break;
-        } // switch()
-    }
-
-    /**
-     * Exports the object as an array.
-     *
-     * You can specify the key type of the array by passing one of the class
-     * type constants.
-     *
-     * @param     string  $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
-     *                    TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                    Defaults to TableMap::TYPE_PHPNAME.
-     * @param     boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
-     * @param     array $alreadyDumpedObjects List of objects to skip to avoid recursion
-     * @param     boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE.
-     *
-     * @return array an associative array containing the field names (as keys) and field values
-     */
-    public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false)
-    {
-        if (isset($alreadyDumpedObjects['OrderAttributeCombination'][$this->getPrimaryKey()])) {
-            return '*RECURSION*';
-        }
-        $alreadyDumpedObjects['OrderAttributeCombination'][$this->getPrimaryKey()] = true;
-        $keys = OrderAttributeCombinationTableMap::getFieldNames($keyType);
-        $result = array(
-            $keys[0] => $this->getId(),
-            $keys[1] => $this->getOrderProductId(),
-            $keys[2] => $this->getAttributeTitle(),
-            $keys[3] => $this->getAttributeChapo(),
-            $keys[4] => $this->getAttributeDescription(),
-            $keys[5] => $this->getAttributePostscriptumn(),
-            $keys[6] => $this->getAttributeAvTitle(),
-            $keys[7] => $this->getAttributeAvChapo(),
-            $keys[8] => $this->getAttributeAvDescription(),
-            $keys[9] => $this->getAttributeAvPostscriptum(),
-            $keys[10] => $this->getCreatedAt(),
-            $keys[11] => $this->getUpdatedAt(),
-        );
-        $virtualColumns = $this->virtualColumns;
-        foreach($virtualColumns as $key => $virtualColumn)
-        {
-            $result[$key] = $virtualColumn;
-        }
-
-        if ($includeForeignObjects) {
-            if (null !== $this->aOrderProduct) {
-                $result['OrderProduct'] = $this->aOrderProduct->toArray($keyType, $includeLazyLoadColumns,  $alreadyDumpedObjects, true);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Sets a field from the object by name passed in as a string.
-     *
-     * @param      string $name
-     * @param      mixed  $value field value
-     * @param      string $type The type of fieldname the $name is of:
-     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                     Defaults to TableMap::TYPE_PHPNAME.
-     * @return void
-     */
-    public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
-    {
-        $pos = OrderAttributeCombinationTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
-
-        return $this->setByPosition($pos, $value);
-    }
-
-    /**
-     * Sets a field from the object by Position as specified in the xml schema.
-     * Zero-based.
-     *
-     * @param      int $pos position in xml schema
-     * @param      mixed $value field value
-     * @return void
-     */
-    public function setByPosition($pos, $value)
-    {
-        switch ($pos) {
-            case 0:
-                $this->setId($value);
-                break;
-            case 1:
-                $this->setOrderProductId($value);
-                break;
-            case 2:
-                $this->setAttributeTitle($value);
-                break;
-            case 3:
-                $this->setAttributeChapo($value);
-                break;
-            case 4:
-                $this->setAttributeDescription($value);
-                break;
-            case 5:
-                $this->setAttributePostscriptumn($value);
-                break;
-            case 6:
-                $this->setAttributeAvTitle($value);
-                break;
-            case 7:
-                $this->setAttributeAvChapo($value);
-                break;
-            case 8:
-                $this->setAttributeAvDescription($value);
-                break;
-            case 9:
-                $this->setAttributeAvPostscriptum($value);
-                break;
-            case 10:
-                $this->setCreatedAt($value);
-                break;
-            case 11:
-                $this->setUpdatedAt($value);
-                break;
-        } // switch()
-    }
-
-    /**
-     * Populates the object using an array.
-     *
-     * This is particularly useful when populating an object from one of the
-     * request arrays (e.g. $_POST).  This method goes through the column
-     * names, checking to see whether a matching key exists in populated
-     * array. If so the setByName() method is called for that column.
-     *
-     * You can specify the key type of the array by additionally passing one
-     * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
-     * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     * The default key type is the column's TableMap::TYPE_PHPNAME.
-     *
-     * @param      array  $arr     An array to populate the object from.
-     * @param      string $keyType The type of keys the array uses.
-     * @return void
-     */
-    public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
-    {
-        $keys = OrderAttributeCombinationTableMap::getFieldNames($keyType);
-
-        if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
-        if (array_key_exists($keys[1], $arr)) $this->setOrderProductId($arr[$keys[1]]);
-        if (array_key_exists($keys[2], $arr)) $this->setAttributeTitle($arr[$keys[2]]);
-        if (array_key_exists($keys[3], $arr)) $this->setAttributeChapo($arr[$keys[3]]);
-        if (array_key_exists($keys[4], $arr)) $this->setAttributeDescription($arr[$keys[4]]);
-        if (array_key_exists($keys[5], $arr)) $this->setAttributePostscriptumn($arr[$keys[5]]);
-        if (array_key_exists($keys[6], $arr)) $this->setAttributeAvTitle($arr[$keys[6]]);
-        if (array_key_exists($keys[7], $arr)) $this->setAttributeAvChapo($arr[$keys[7]]);
-        if (array_key_exists($keys[8], $arr)) $this->setAttributeAvDescription($arr[$keys[8]]);
-        if (array_key_exists($keys[9], $arr)) $this->setAttributeAvPostscriptum($arr[$keys[9]]);
-        if (array_key_exists($keys[10], $arr)) $this->setCreatedAt($arr[$keys[10]]);
-        if (array_key_exists($keys[11], $arr)) $this->setUpdatedAt($arr[$keys[11]]);
-    }
-
-    /**
-     * Build a Criteria object containing the values of all modified columns in this object.
-     *
-     * @return Criteria The Criteria object containing all modified values.
-     */
-    public function buildCriteria()
-    {
-        $criteria = new Criteria(OrderAttributeCombinationTableMap::DATABASE_NAME);
-
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ID)) $criteria->add(OrderAttributeCombinationTableMap::ID, $this->id);
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID)) $criteria->add(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, $this->order_product_id);
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE, $this->attribute_title);
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO, $this->attribute_chapo);
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION, $this->attribute_description);
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN, $this->attribute_postscriptumn);
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE, $this->attribute_av_title);
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO, $this->attribute_av_chapo);
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION, $this->attribute_av_description);
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM, $this->attribute_av_postscriptum);
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::CREATED_AT)) $criteria->add(OrderAttributeCombinationTableMap::CREATED_AT, $this->created_at);
-        if ($this->isColumnModified(OrderAttributeCombinationTableMap::UPDATED_AT)) $criteria->add(OrderAttributeCombinationTableMap::UPDATED_AT, $this->updated_at);
-
-        return $criteria;
-    }
-
-    /**
-     * Builds a Criteria object containing the primary key for this object.
-     *
-     * Unlike buildCriteria() this method includes the primary key values regardless
-     * of whether or not they have been modified.
-     *
-     * @return Criteria The Criteria object containing value(s) for primary key(s).
-     */
-    public function buildPkeyCriteria()
-    {
-        $criteria = new Criteria(OrderAttributeCombinationTableMap::DATABASE_NAME);
-        $criteria->add(OrderAttributeCombinationTableMap::ID, $this->id);
-
-        return $criteria;
-    }
-
-    /**
-     * Returns the primary key for this object (row).
-     * @return   int
-     */
-    public function getPrimaryKey()
-    {
-        return $this->getId();
-    }
-
-    /**
-     * Generic method to set the primary key (id column).
-     *
-     * @param       int $key Primary key.
-     * @return void
-     */
-    public function setPrimaryKey($key)
-    {
-        $this->setId($key);
-    }
-
-    /**
-     * Returns true if the primary key for this object is null.
-     * @return boolean
-     */
-    public function isPrimaryKeyNull()
-    {
-
-        return null === $this->getId();
-    }
-
-    /**
-     * Sets contents of passed object to values from current object.
-     *
-     * If desired, this method can also make copies of all associated (fkey referrers)
-     * objects.
-     *
-     * @param      object $copyObj An object of \Thelia\Model\OrderAttributeCombination (or compatible) type.
-     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @param      boolean $makeNew Whether to reset autoincrement PKs and make the object new.
-     * @throws PropelException
-     */
-    public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
-    {
-        $copyObj->setOrderProductId($this->getOrderProductId());
-        $copyObj->setAttributeTitle($this->getAttributeTitle());
-        $copyObj->setAttributeChapo($this->getAttributeChapo());
-        $copyObj->setAttributeDescription($this->getAttributeDescription());
-        $copyObj->setAttributePostscriptumn($this->getAttributePostscriptumn());
-        $copyObj->setAttributeAvTitle($this->getAttributeAvTitle());
-        $copyObj->setAttributeAvChapo($this->getAttributeAvChapo());
-        $copyObj->setAttributeAvDescription($this->getAttributeAvDescription());
-        $copyObj->setAttributeAvPostscriptum($this->getAttributeAvPostscriptum());
-        $copyObj->setCreatedAt($this->getCreatedAt());
-        $copyObj->setUpdatedAt($this->getUpdatedAt());
-        if ($makeNew) {
-            $copyObj->setNew(true);
-            $copyObj->setId(NULL); // this is a auto-increment column, so set to default value
-        }
-    }
-
-    /**
-     * Makes a copy of this object that will be inserted as a new row in table when saved.
-     * It creates a new object filling in the simple attributes, but skipping any primary
-     * keys that are defined for the table.
-     *
-     * If desired, this method can also make copies of all associated (fkey referrers)
-     * objects.
-     *
-     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @return                 \Thelia\Model\OrderAttributeCombination Clone of current object.
-     * @throws PropelException
-     */
-    public function copy($deepCopy = false)
-    {
-        // we use get_class(), because this might be a subclass
-        $clazz = get_class($this);
-        $copyObj = new $clazz();
-        $this->copyInto($copyObj, $deepCopy);
-
-        return $copyObj;
-    }
-
-    /**
-     * Declares an association between this object and a ChildOrderProduct object.
-     *
-     * @param                  ChildOrderProduct $v
-     * @return                 \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
-     * @throws PropelException
-     */
-    public function setOrderProduct(ChildOrderProduct $v = null)
-    {
-        if ($v === null) {
-            $this->setOrderProductId(NULL);
-        } else {
-            $this->setOrderProductId($v->getId());
-        }
-
-        $this->aOrderProduct = $v;
-
-        // Add binding for other direction of this n:n relationship.
-        // If this object has already been added to the ChildOrderProduct object, it will not be re-added.
-        if ($v !== null) {
-            $v->addOrderAttributeCombination($this);
-        }
-
-
-        return $this;
-    }
-
-
-    /**
-     * Get the associated ChildOrderProduct object
-     *
-     * @param      ConnectionInterface $con Optional Connection object.
-     * @return                 ChildOrderProduct The associated ChildOrderProduct object.
-     * @throws PropelException
-     */
-    public function getOrderProduct(ConnectionInterface $con = null)
-    {
-        if ($this->aOrderProduct === null && ($this->order_product_id !== null)) {
-            $this->aOrderProduct = ChildOrderProductQuery::create()->findPk($this->order_product_id, $con);
-            /* The following can be used additionally to
-                guarantee the related object contains a reference
-                to this object.  This level of coupling may, however, be
-                undesirable since it could result in an only partially populated collection
-                in the referenced object.
-                $this->aOrderProduct->addOrderAttributeCombinations($this);
-             */
-        }
-
-        return $this->aOrderProduct;
-    }
-
-    /**
-     * Clears the current object and sets all attributes to their default values
-     */
-    public function clear()
-    {
-        $this->id = null;
-        $this->order_product_id = null;
-        $this->attribute_title = null;
-        $this->attribute_chapo = null;
-        $this->attribute_description = null;
-        $this->attribute_postscriptumn = null;
-        $this->attribute_av_title = null;
-        $this->attribute_av_chapo = null;
-        $this->attribute_av_description = null;
-        $this->attribute_av_postscriptum = null;
-        $this->created_at = null;
-        $this->updated_at = null;
-        $this->alreadyInSave = false;
-        $this->clearAllReferences();
-        $this->resetModified();
-        $this->setNew(true);
-        $this->setDeleted(false);
-    }
-
-    /**
-     * Resets all references to other model objects or collections of model objects.
-     *
-     * This method is a user-space workaround for PHP's inability to garbage collect
-     * objects with circular references (even in PHP 5.3). This is currently necessary
-     * when using Propel in certain daemon or large-volume/high-memory operations.
-     *
-     * @param      boolean $deep Whether to also clear the references on all referrer objects.
-     */
-    public function clearAllReferences($deep = false)
-    {
-        if ($deep) {
-        } // if ($deep)
-
-        $this->aOrderProduct = null;
-    }
-
-    /**
-     * Return the string representation of this object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->exportTo(OrderAttributeCombinationTableMap::DEFAULT_STRING_FORMAT);
-    }
-
-    // timestampable behavior
-
-    /**
-     * Mark the current object so that the update date doesn't get updated during next save
-     *
-     * @return     ChildOrderAttributeCombination The current object (for fluent API support)
-     */
-    public function keepUpdateDateUnchanged()
-    {
-        $this->modifiedColumns[] = OrderAttributeCombinationTableMap::UPDATED_AT;
-
-        return $this;
-    }
-
-    /**
-     * Code to be run before persisting the object
-     * @param  ConnectionInterface $con
-     * @return boolean
-     */
-    public function preSave(ConnectionInterface $con = null)
-    {
-        return true;
-    }
-
-    /**
-     * Code to be run after persisting the object
-     * @param ConnectionInterface $con
-     */
-    public function postSave(ConnectionInterface $con = null)
-    {
-
-    }
-
-    /**
-     * Code to be run before inserting to database
-     * @param  ConnectionInterface $con
-     * @return boolean
-     */
-    public function preInsert(ConnectionInterface $con = null)
-    {
-        return true;
-    }
-
-    /**
-     * Code to be run after inserting to database
-     * @param ConnectionInterface $con
-     */
-    public function postInsert(ConnectionInterface $con = null)
-    {
-
-    }
-
-    /**
-     * Code to be run before updating the object in database
-     * @param  ConnectionInterface $con
-     * @return boolean
-     */
-    public function preUpdate(ConnectionInterface $con = null)
-    {
-        return true;
-    }
-
-    /**
-     * Code to be run after updating the object in database
-     * @param ConnectionInterface $con
-     */
-    public function postUpdate(ConnectionInterface $con = null)
-    {
-
-    }
-
-    /**
-     * Code to be run before deleting the object in database
-     * @param  ConnectionInterface $con
-     * @return boolean
-     */
-    public function preDelete(ConnectionInterface $con = null)
-    {
-        return true;
-    }
-
-    /**
-     * Code to be run after deleting the object in database
-     * @param ConnectionInterface $con
-     */
-    public function postDelete(ConnectionInterface $con = null)
-    {
-
-    }
-
-
-    /**
-     * Derived method to catches calls to undefined methods.
-     *
-     * Provides magic import/export method support (fromXML()/toXML(), fromYAML()/toYAML(), etc.).
-     * Allows to define default __call() behavior if you overwrite __call()
-     *
-     * @param string $name
-     * @param mixed  $params
-     *
-     * @return array|string
-     */
-    public function __call($name, $params)
-    {
-        if (0 === strpos($name, 'get')) {
-            $virtualColumn = substr($name, 3);
-            if ($this->hasVirtualColumn($virtualColumn)) {
-                return $this->getVirtualColumn($virtualColumn);
-            }
-
-            $virtualColumn = lcfirst($virtualColumn);
-            if ($this->hasVirtualColumn($virtualColumn)) {
-                return $this->getVirtualColumn($virtualColumn);
-            }
-        }
-
-        if (0 === strpos($name, 'from')) {
-            $format = substr($name, 4);
-
-            return $this->importFrom($format, reset($params));
-        }
-
-        if (0 === strpos($name, 'to')) {
-            $format = substr($name, 2);
-            $includeLazyLoadColumns = isset($params[0]) ? $params[0] : true;
-
-            return $this->exportTo($format, $includeLazyLoadColumns);
-        }
-
-        throw new BadMethodCallException(sprintf('Call to undefined method: %s.', $name));
-    }
-
-}
diff --git a/core/lib/Thelia/Model/Base/OrderAttributeCombinationQuery.php b/core/lib/Thelia/Model/Base/OrderAttributeCombinationQuery.php
deleted file mode 100644
index 0c7e7bfd8..000000000
--- a/core/lib/Thelia/Model/Base/OrderAttributeCombinationQuery.php
+++ /dev/null
@@ -1,897 +0,0 @@
-<?php
-
-namespace Thelia\Model\Base;
-
-use \Exception;
-use \PDO;
-use Propel\Runtime\Propel;
-use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\ModelCriteria;
-use Propel\Runtime\ActiveQuery\ModelJoin;
-use Propel\Runtime\Collection\Collection;
-use Propel\Runtime\Collection\ObjectCollection;
-use Propel\Runtime\Connection\ConnectionInterface;
-use Propel\Runtime\Exception\PropelException;
-use Thelia\Model\OrderAttributeCombination as ChildOrderAttributeCombination;
-use Thelia\Model\OrderAttributeCombinationQuery as ChildOrderAttributeCombinationQuery;
-use Thelia\Model\Map\OrderAttributeCombinationTableMap;
-
-/**
- * Base class that represents a query for the 'order_attribute_combination' table.
- *
- *
- *
- * @method     ChildOrderAttributeCombinationQuery orderById($order = Criteria::ASC) Order by the id column
- * @method     ChildOrderAttributeCombinationQuery orderByOrderProductId($order = Criteria::ASC) Order by the order_product_id column
- * @method     ChildOrderAttributeCombinationQuery orderByAttributeTitle($order = Criteria::ASC) Order by the attribute_title column
- * @method     ChildOrderAttributeCombinationQuery orderByAttributeChapo($order = Criteria::ASC) Order by the attribute_chapo column
- * @method     ChildOrderAttributeCombinationQuery orderByAttributeDescription($order = Criteria::ASC) Order by the attribute_description column
- * @method     ChildOrderAttributeCombinationQuery orderByAttributePostscriptumn($order = Criteria::ASC) Order by the attribute_postscriptumn column
- * @method     ChildOrderAttributeCombinationQuery orderByAttributeAvTitle($order = Criteria::ASC) Order by the attribute_av_title column
- * @method     ChildOrderAttributeCombinationQuery orderByAttributeAvChapo($order = Criteria::ASC) Order by the attribute_av_chapo column
- * @method     ChildOrderAttributeCombinationQuery orderByAttributeAvDescription($order = Criteria::ASC) Order by the attribute_av_description column
- * @method     ChildOrderAttributeCombinationQuery orderByAttributeAvPostscriptum($order = Criteria::ASC) Order by the attribute_av_postscriptum column
- * @method     ChildOrderAttributeCombinationQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
- * @method     ChildOrderAttributeCombinationQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
- *
- * @method     ChildOrderAttributeCombinationQuery groupById() Group by the id column
- * @method     ChildOrderAttributeCombinationQuery groupByOrderProductId() Group by the order_product_id column
- * @method     ChildOrderAttributeCombinationQuery groupByAttributeTitle() Group by the attribute_title column
- * @method     ChildOrderAttributeCombinationQuery groupByAttributeChapo() Group by the attribute_chapo column
- * @method     ChildOrderAttributeCombinationQuery groupByAttributeDescription() Group by the attribute_description column
- * @method     ChildOrderAttributeCombinationQuery groupByAttributePostscriptumn() Group by the attribute_postscriptumn column
- * @method     ChildOrderAttributeCombinationQuery groupByAttributeAvTitle() Group by the attribute_av_title column
- * @method     ChildOrderAttributeCombinationQuery groupByAttributeAvChapo() Group by the attribute_av_chapo column
- * @method     ChildOrderAttributeCombinationQuery groupByAttributeAvDescription() Group by the attribute_av_description column
- * @method     ChildOrderAttributeCombinationQuery groupByAttributeAvPostscriptum() Group by the attribute_av_postscriptum column
- * @method     ChildOrderAttributeCombinationQuery groupByCreatedAt() Group by the created_at column
- * @method     ChildOrderAttributeCombinationQuery groupByUpdatedAt() Group by the updated_at column
- *
- * @method     ChildOrderAttributeCombinationQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
- * @method     ChildOrderAttributeCombinationQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
- * @method     ChildOrderAttributeCombinationQuery innerJoin($relation) Adds a INNER JOIN clause to the query
- *
- * @method     ChildOrderAttributeCombinationQuery leftJoinOrderProduct($relationAlias = null) Adds a LEFT JOIN clause to the query using the OrderProduct relation
- * @method     ChildOrderAttributeCombinationQuery rightJoinOrderProduct($relationAlias = null) Adds a RIGHT JOIN clause to the query using the OrderProduct relation
- * @method     ChildOrderAttributeCombinationQuery innerJoinOrderProduct($relationAlias = null) Adds a INNER JOIN clause to the query using the OrderProduct relation
- *
- * @method     ChildOrderAttributeCombination findOne(ConnectionInterface $con = null) Return the first ChildOrderAttributeCombination matching the query
- * @method     ChildOrderAttributeCombination findOneOrCreate(ConnectionInterface $con = null) Return the first ChildOrderAttributeCombination matching the query, or a new ChildOrderAttributeCombination object populated from the query conditions when no match is found
- *
- * @method     ChildOrderAttributeCombination findOneById(int $id) Return the first ChildOrderAttributeCombination filtered by the id column
- * @method     ChildOrderAttributeCombination findOneByOrderProductId(int $order_product_id) Return the first ChildOrderAttributeCombination filtered by the order_product_id column
- * @method     ChildOrderAttributeCombination findOneByAttributeTitle(string $attribute_title) Return the first ChildOrderAttributeCombination filtered by the attribute_title column
- * @method     ChildOrderAttributeCombination findOneByAttributeChapo(string $attribute_chapo) Return the first ChildOrderAttributeCombination filtered by the attribute_chapo column
- * @method     ChildOrderAttributeCombination findOneByAttributeDescription(string $attribute_description) Return the first ChildOrderAttributeCombination filtered by the attribute_description column
- * @method     ChildOrderAttributeCombination findOneByAttributePostscriptumn(string $attribute_postscriptumn) Return the first ChildOrderAttributeCombination filtered by the attribute_postscriptumn column
- * @method     ChildOrderAttributeCombination findOneByAttributeAvTitle(string $attribute_av_title) Return the first ChildOrderAttributeCombination filtered by the attribute_av_title column
- * @method     ChildOrderAttributeCombination findOneByAttributeAvChapo(string $attribute_av_chapo) Return the first ChildOrderAttributeCombination filtered by the attribute_av_chapo column
- * @method     ChildOrderAttributeCombination findOneByAttributeAvDescription(string $attribute_av_description) Return the first ChildOrderAttributeCombination filtered by the attribute_av_description column
- * @method     ChildOrderAttributeCombination findOneByAttributeAvPostscriptum(string $attribute_av_postscriptum) Return the first ChildOrderAttributeCombination filtered by the attribute_av_postscriptum column
- * @method     ChildOrderAttributeCombination findOneByCreatedAt(string $created_at) Return the first ChildOrderAttributeCombination filtered by the created_at column
- * @method     ChildOrderAttributeCombination findOneByUpdatedAt(string $updated_at) Return the first ChildOrderAttributeCombination filtered by the updated_at column
- *
- * @method     array findById(int $id) Return ChildOrderAttributeCombination objects filtered by the id column
- * @method     array findByOrderProductId(int $order_product_id) Return ChildOrderAttributeCombination objects filtered by the order_product_id column
- * @method     array findByAttributeTitle(string $attribute_title) Return ChildOrderAttributeCombination objects filtered by the attribute_title column
- * @method     array findByAttributeChapo(string $attribute_chapo) Return ChildOrderAttributeCombination objects filtered by the attribute_chapo column
- * @method     array findByAttributeDescription(string $attribute_description) Return ChildOrderAttributeCombination objects filtered by the attribute_description column
- * @method     array findByAttributePostscriptumn(string $attribute_postscriptumn) Return ChildOrderAttributeCombination objects filtered by the attribute_postscriptumn column
- * @method     array findByAttributeAvTitle(string $attribute_av_title) Return ChildOrderAttributeCombination objects filtered by the attribute_av_title column
- * @method     array findByAttributeAvChapo(string $attribute_av_chapo) Return ChildOrderAttributeCombination objects filtered by the attribute_av_chapo column
- * @method     array findByAttributeAvDescription(string $attribute_av_description) Return ChildOrderAttributeCombination objects filtered by the attribute_av_description column
- * @method     array findByAttributeAvPostscriptum(string $attribute_av_postscriptum) Return ChildOrderAttributeCombination objects filtered by the attribute_av_postscriptum column
- * @method     array findByCreatedAt(string $created_at) Return ChildOrderAttributeCombination objects filtered by the created_at column
- * @method     array findByUpdatedAt(string $updated_at) Return ChildOrderAttributeCombination objects filtered by the updated_at column
- *
- */
-abstract class OrderAttributeCombinationQuery extends ModelCriteria
-{
-
-    /**
-     * Initializes internal state of \Thelia\Model\Base\OrderAttributeCombinationQuery object.
-     *
-     * @param     string $dbName The database name
-     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
-     */
-    public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\OrderAttributeCombination', $modelAlias = null)
-    {
-        parent::__construct($dbName, $modelName, $modelAlias);
-    }
-
-    /**
-     * Returns a new ChildOrderAttributeCombinationQuery object.
-     *
-     * @param     string $modelAlias The alias of a model in the query
-     * @param     Criteria $criteria Optional Criteria to build the query from
-     *
-     * @return ChildOrderAttributeCombinationQuery
-     */
-    public static function create($modelAlias = null, $criteria = null)
-    {
-        if ($criteria instanceof \Thelia\Model\OrderAttributeCombinationQuery) {
-            return $criteria;
-        }
-        $query = new \Thelia\Model\OrderAttributeCombinationQuery();
-        if (null !== $modelAlias) {
-            $query->setModelAlias($modelAlias);
-        }
-        if ($criteria instanceof Criteria) {
-            $query->mergeWith($criteria);
-        }
-
-        return $query;
-    }
-
-    /**
-     * Find object by primary key.
-     * Propel uses the instance pool to skip the database if the object exists.
-     * Go fast if the query is untouched.
-     *
-     * <code>
-     * $obj  = $c->findPk(12, $con);
-     * </code>
-     *
-     * @param mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con an optional connection object
-     *
-     * @return ChildOrderAttributeCombination|array|mixed the result, formatted by the current formatter
-     */
-    public function findPk($key, $con = null)
-    {
-        if ($key === null) {
-            return null;
-        }
-        if ((null !== ($obj = OrderAttributeCombinationTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
-            // the object is already in the instance pool
-            return $obj;
-        }
-        if ($con === null) {
-            $con = Propel::getServiceContainer()->getReadConnection(OrderAttributeCombinationTableMap::DATABASE_NAME);
-        }
-        $this->basePreSelect($con);
-        if ($this->formatter || $this->modelAlias || $this->with || $this->select
-         || $this->selectColumns || $this->asColumns || $this->selectModifiers
-         || $this->map || $this->having || $this->joins) {
-            return $this->findPkComplex($key, $con);
-        } else {
-            return $this->findPkSimple($key, $con);
-        }
-    }
-
-    /**
-     * Find object by primary key using raw SQL to go fast.
-     * Bypass doSelect() and the object formatter by using generated code.
-     *
-     * @param     mixed $key Primary key to use for the query
-     * @param     ConnectionInterface $con A connection object
-     *
-     * @return   ChildOrderAttributeCombination A model object, or null if the key is not found
-     */
-    protected function findPkSimple($key, $con)
-    {
-        $sql = 'SELECT ID, ORDER_PRODUCT_ID, ATTRIBUTE_TITLE, ATTRIBUTE_CHAPO, ATTRIBUTE_DESCRIPTION, ATTRIBUTE_POSTSCRIPTUMN, ATTRIBUTE_AV_TITLE, ATTRIBUTE_AV_CHAPO, ATTRIBUTE_AV_DESCRIPTION, ATTRIBUTE_AV_POSTSCRIPTUM, CREATED_AT, UPDATED_AT FROM order_attribute_combination WHERE ID = :p0';
-        try {
-            $stmt = $con->prepare($sql);
-            $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
-            $stmt->execute();
-        } catch (Exception $e) {
-            Propel::log($e->getMessage(), Propel::LOG_ERR);
-            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
-        }
-        $obj = null;
-        if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
-            $obj = new ChildOrderAttributeCombination();
-            $obj->hydrate($row);
-            OrderAttributeCombinationTableMap::addInstanceToPool($obj, (string) $key);
-        }
-        $stmt->closeCursor();
-
-        return $obj;
-    }
-
-    /**
-     * Find object by primary key.
-     *
-     * @param     mixed $key Primary key to use for the query
-     * @param     ConnectionInterface $con A connection object
-     *
-     * @return ChildOrderAttributeCombination|array|mixed the result, formatted by the current formatter
-     */
-    protected function findPkComplex($key, $con)
-    {
-        // As the query uses a PK condition, no limit(1) is necessary.
-        $criteria = $this->isKeepQuery() ? clone $this : $this;
-        $dataFetcher = $criteria
-            ->filterByPrimaryKey($key)
-            ->doSelect($con);
-
-        return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher);
-    }
-
-    /**
-     * Find objects by primary key
-     * <code>
-     * $objs = $c->findPks(array(12, 56, 832), $con);
-     * </code>
-     * @param     array $keys Primary keys to use for the query
-     * @param     ConnectionInterface $con an optional connection object
-     *
-     * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
-     */
-    public function findPks($keys, $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getReadConnection($this->getDbName());
-        }
-        $this->basePreSelect($con);
-        $criteria = $this->isKeepQuery() ? clone $this : $this;
-        $dataFetcher = $criteria
-            ->filterByPrimaryKeys($keys)
-            ->doSelect($con);
-
-        return $criteria->getFormatter()->init($criteria)->format($dataFetcher);
-    }
-
-    /**
-     * Filter the query by primary key
-     *
-     * @param     mixed $key Primary key to use for the query
-     *
-     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function filterByPrimaryKey($key)
-    {
-
-        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ID, $key, Criteria::EQUAL);
-    }
-
-    /**
-     * Filter the query by a list of primary keys
-     *
-     * @param     array $keys The list of primary key to use for the query
-     *
-     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function filterByPrimaryKeys($keys)
-    {
-
-        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ID, $keys, Criteria::IN);
-    }
-
-    /**
-     * Filter the query on the id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterById(1234); // WHERE id = 1234
-     * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
-     * $query->filterById(array('min' => 12)); // WHERE id > 12
-     * </code>
-     *
-     * @param     mixed $id The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function filterById($id = null, $comparison = null)
-    {
-        if (is_array($id)) {
-            $useMinMax = false;
-            if (isset($id['min'])) {
-                $this->addUsingAlias(OrderAttributeCombinationTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($id['max'])) {
-                $this->addUsingAlias(OrderAttributeCombinationTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ID, $id, $comparison);
-    }
-
-    /**
-     * Filter the query on the order_product_id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByOrderProductId(1234); // WHERE order_product_id = 1234
-     * $query->filterByOrderProductId(array(12, 34)); // WHERE order_product_id IN (12, 34)
-     * $query->filterByOrderProductId(array('min' => 12)); // WHERE order_product_id > 12
-     * </code>
-     *
-     * @see       filterByOrderProduct()
-     *
-     * @param     mixed $orderProductId The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function filterByOrderProductId($orderProductId = null, $comparison = null)
-    {
-        if (is_array($orderProductId)) {
-            $useMinMax = false;
-            if (isset($orderProductId['min'])) {
-                $this->addUsingAlias(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProductId['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($orderProductId['max'])) {
-                $this->addUsingAlias(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProductId['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProductId, $comparison);
-    }
-
-    /**
-     * Filter the query on the attribute_title column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByAttributeTitle('fooValue');   // WHERE attribute_title = 'fooValue'
-     * $query->filterByAttributeTitle('%fooValue%'); // WHERE attribute_title LIKE '%fooValue%'
-     * </code>
-     *
-     * @param     string $attributeTitle The value to use as filter.
-     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function filterByAttributeTitle($attributeTitle = null, $comparison = null)
-    {
-        if (null === $comparison) {
-            if (is_array($attributeTitle)) {
-                $comparison = Criteria::IN;
-            } elseif (preg_match('/[\%\*]/', $attributeTitle)) {
-                $attributeTitle = str_replace('*', '%', $attributeTitle);
-                $comparison = Criteria::LIKE;
-            }
-        }
-
-        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE, $attributeTitle, $comparison);
-    }
-
-    /**
-     * Filter the query on the attribute_chapo column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByAttributeChapo('fooValue');   // WHERE attribute_chapo = 'fooValue'
-     * $query->filterByAttributeChapo('%fooValue%'); // WHERE attribute_chapo LIKE '%fooValue%'
-     * </code>
-     *
-     * @param     string $attributeChapo The value to use as filter.
-     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function filterByAttributeChapo($attributeChapo = null, $comparison = null)
-    {
-        if (null === $comparison) {
-            if (is_array($attributeChapo)) {
-                $comparison = Criteria::IN;
-            } elseif (preg_match('/[\%\*]/', $attributeChapo)) {
-                $attributeChapo = str_replace('*', '%', $attributeChapo);
-                $comparison = Criteria::LIKE;
-            }
-        }
-
-        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO, $attributeChapo, $comparison);
-    }
-
-    /**
-     * Filter the query on the attribute_description column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByAttributeDescription('fooValue');   // WHERE attribute_description = 'fooValue'
-     * $query->filterByAttributeDescription('%fooValue%'); // WHERE attribute_description LIKE '%fooValue%'
-     * </code>
-     *
-     * @param     string $attributeDescription The value to use as filter.
-     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function filterByAttributeDescription($attributeDescription = null, $comparison = null)
-    {
-        if (null === $comparison) {
-            if (is_array($attributeDescription)) {
-                $comparison = Criteria::IN;
-            } elseif (preg_match('/[\%\*]/', $attributeDescription)) {
-                $attributeDescription = str_replace('*', '%', $attributeDescription);
-                $comparison = Criteria::LIKE;
-            }
-        }
-
-        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION, $attributeDescription, $comparison);
-    }
-
-    /**
-     * Filter the query on the attribute_postscriptumn column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByAttributePostscriptumn('fooValue');   // WHERE attribute_postscriptumn = 'fooValue'
-     * $query->filterByAttributePostscriptumn('%fooValue%'); // WHERE attribute_postscriptumn LIKE '%fooValue%'
-     * </code>
-     *
-     * @param     string $attributePostscriptumn The value to use as filter.
-     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function filterByAttributePostscriptumn($attributePostscriptumn = null, $comparison = null)
-    {
-        if (null === $comparison) {
-            if (is_array($attributePostscriptumn)) {
-                $comparison = Criteria::IN;
-            } elseif (preg_match('/[\%\*]/', $attributePostscriptumn)) {
-                $attributePostscriptumn = str_replace('*', '%', $attributePostscriptumn);
-                $comparison = Criteria::LIKE;
-            }
-        }
-
-        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN, $attributePostscriptumn, $comparison);
-    }
-
-    /**
-     * Filter the query on the attribute_av_title column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByAttributeAvTitle('fooValue');   // WHERE attribute_av_title = 'fooValue'
-     * $query->filterByAttributeAvTitle('%fooValue%'); // WHERE attribute_av_title LIKE '%fooValue%'
-     * </code>
-     *
-     * @param     string $attributeAvTitle The value to use as filter.
-     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function filterByAttributeAvTitle($attributeAvTitle = null, $comparison = null)
-    {
-        if (null === $comparison) {
-            if (is_array($attributeAvTitle)) {
-                $comparison = Criteria::IN;
-            } elseif (preg_match('/[\%\*]/', $attributeAvTitle)) {
-                $attributeAvTitle = str_replace('*', '%', $attributeAvTitle);
-                $comparison = Criteria::LIKE;
-            }
-        }
-
-        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE, $attributeAvTitle, $comparison);
-    }
-
-    /**
-     * Filter the query on the attribute_av_chapo column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByAttributeAvChapo('fooValue');   // WHERE attribute_av_chapo = 'fooValue'
-     * $query->filterByAttributeAvChapo('%fooValue%'); // WHERE attribute_av_chapo LIKE '%fooValue%'
-     * </code>
-     *
-     * @param     string $attributeAvChapo The value to use as filter.
-     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function filterByAttributeAvChapo($attributeAvChapo = null, $comparison = null)
-    {
-        if (null === $comparison) {
-            if (is_array($attributeAvChapo)) {
-                $comparison = Criteria::IN;
-            } elseif (preg_match('/[\%\*]/', $attributeAvChapo)) {
-                $attributeAvChapo = str_replace('*', '%', $attributeAvChapo);
-                $comparison = Criteria::LIKE;
-            }
-        }
-
-        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO, $attributeAvChapo, $comparison);
-    }
-
-    /**
-     * Filter the query on the attribute_av_description column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByAttributeAvDescription('fooValue');   // WHERE attribute_av_description = 'fooValue'
-     * $query->filterByAttributeAvDescription('%fooValue%'); // WHERE attribute_av_description LIKE '%fooValue%'
-     * </code>
-     *
-     * @param     string $attributeAvDescription The value to use as filter.
-     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function filterByAttributeAvDescription($attributeAvDescription = null, $comparison = null)
-    {
-        if (null === $comparison) {
-            if (is_array($attributeAvDescription)) {
-                $comparison = Criteria::IN;
-            } elseif (preg_match('/[\%\*]/', $attributeAvDescription)) {
-                $attributeAvDescription = str_replace('*', '%', $attributeAvDescription);
-                $comparison = Criteria::LIKE;
-            }
-        }
-
-        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION, $attributeAvDescription, $comparison);
-    }
-
-    /**
-     * Filter the query on the attribute_av_postscriptum column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByAttributeAvPostscriptum('fooValue');   // WHERE attribute_av_postscriptum = 'fooValue'
-     * $query->filterByAttributeAvPostscriptum('%fooValue%'); // WHERE attribute_av_postscriptum LIKE '%fooValue%'
-     * </code>
-     *
-     * @param     string $attributeAvPostscriptum The value to use as filter.
-     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function filterByAttributeAvPostscriptum($attributeAvPostscriptum = null, $comparison = null)
-    {
-        if (null === $comparison) {
-            if (is_array($attributeAvPostscriptum)) {
-                $comparison = Criteria::IN;
-            } elseif (preg_match('/[\%\*]/', $attributeAvPostscriptum)) {
-                $attributeAvPostscriptum = str_replace('*', '%', $attributeAvPostscriptum);
-                $comparison = Criteria::LIKE;
-            }
-        }
-
-        return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM, $attributeAvPostscriptum, $comparison);
-    }
-
-    /**
-     * Filter the query on the created_at column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14'
-     * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14'
-     * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
-     * </code>
-     *
-     * @param     mixed $createdAt The value to use as filter.
-     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *              Empty strings are treated as NULL.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function filterByCreatedAt($createdAt = null, $comparison = null)
-    {
-        if (is_array($createdAt)) {
-            $useMinMax = false;
-            if (isset($createdAt['min'])) {
-                $this->addUsingAlias(OrderAttributeCombinationTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($createdAt['max'])) {
-                $this->addUsingAlias(OrderAttributeCombinationTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(OrderAttributeCombinationTableMap::CREATED_AT, $createdAt, $comparison);
-    }
-
-    /**
-     * Filter the query on the updated_at column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14'
-     * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14'
-     * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
-     * </code>
-     *
-     * @param     mixed $updatedAt The value to use as filter.
-     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *              Empty strings are treated as NULL.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function filterByUpdatedAt($updatedAt = null, $comparison = null)
-    {
-        if (is_array($updatedAt)) {
-            $useMinMax = false;
-            if (isset($updatedAt['min'])) {
-                $this->addUsingAlias(OrderAttributeCombinationTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($updatedAt['max'])) {
-                $this->addUsingAlias(OrderAttributeCombinationTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(OrderAttributeCombinationTableMap::UPDATED_AT, $updatedAt, $comparison);
-    }
-
-    /**
-     * Filter the query by a related \Thelia\Model\OrderProduct object
-     *
-     * @param \Thelia\Model\OrderProduct|ObjectCollection $orderProduct The related object(s) to use as filter
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function filterByOrderProduct($orderProduct, $comparison = null)
-    {
-        if ($orderProduct instanceof \Thelia\Model\OrderProduct) {
-            return $this
-                ->addUsingAlias(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProduct->getId(), $comparison);
-        } elseif ($orderProduct instanceof ObjectCollection) {
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-
-            return $this
-                ->addUsingAlias(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProduct->toKeyValue('PrimaryKey', 'Id'), $comparison);
-        } else {
-            throw new PropelException('filterByOrderProduct() only accepts arguments of type \Thelia\Model\OrderProduct or Collection');
-        }
-    }
-
-    /**
-     * Adds a JOIN clause to the query using the OrderProduct relation
-     *
-     * @param     string $relationAlias optional alias for the relation
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function joinOrderProduct($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('OrderProduct');
-
-        // create a ModelJoin object for this join
-        $join = new ModelJoin();
-        $join->setJoinType($joinType);
-        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
-        if ($previousJoin = $this->getPreviousJoin()) {
-            $join->setPreviousJoin($previousJoin);
-        }
-
-        // add the ModelJoin to the current object
-        if ($relationAlias) {
-            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
-            $this->addJoinObject($join, $relationAlias);
-        } else {
-            $this->addJoinObject($join, 'OrderProduct');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Use the OrderProduct relation OrderProduct object
-     *
-     * @see useQuery()
-     *
-     * @param     string $relationAlias optional alias for the relation,
-     *                                   to be used as main alias in the secondary query
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return   \Thelia\Model\OrderProductQuery A secondary query class using the current class as primary query
-     */
-    public function useOrderProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        return $this
-            ->joinOrderProduct($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'OrderProduct', '\Thelia\Model\OrderProductQuery');
-    }
-
-    /**
-     * Exclude object from result
-     *
-     * @param   ChildOrderAttributeCombination $orderAttributeCombination Object to remove from the list of results
-     *
-     * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function prune($orderAttributeCombination = null)
-    {
-        if ($orderAttributeCombination) {
-            $this->addUsingAlias(OrderAttributeCombinationTableMap::ID, $orderAttributeCombination->getId(), Criteria::NOT_EQUAL);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Deletes all rows from the order_attribute_combination table.
-     *
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).
-     */
-    public function doDeleteAll(ConnectionInterface $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(OrderAttributeCombinationTableMap::DATABASE_NAME);
-        }
-        $affectedRows = 0; // initialize var to track total num of affected rows
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table or we could emulating ON DELETE CASCADE, etc.
-            $con->beginTransaction();
-            $affectedRows += parent::doDeleteAll($con);
-            // Because this db requires some delete cascade/set null emulation, we have to
-            // clear the cached instance *after* the emulation has happened (since
-            // instances get re-added by the select statement contained therein).
-            OrderAttributeCombinationTableMap::clearInstancePool();
-            OrderAttributeCombinationTableMap::clearRelatedInstancePool();
-
-            $con->commit();
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-
-        return $affectedRows;
-    }
-
-    /**
-     * Performs a DELETE on the database, given a ChildOrderAttributeCombination or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or ChildOrderAttributeCombination object or primary key or array of primary keys
-     *              which is used to create the DELETE statement
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-     public function delete(ConnectionInterface $con = null)
-     {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(OrderAttributeCombinationTableMap::DATABASE_NAME);
-        }
-
-        $criteria = $this;
-
-        // Set the correct dbName
-        $criteria->setDbName(OrderAttributeCombinationTableMap::DATABASE_NAME);
-
-        $affectedRows = 0; // initialize var to track total num of affected rows
-
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table or we could emulating ON DELETE CASCADE, etc.
-            $con->beginTransaction();
-
-
-        OrderAttributeCombinationTableMap::removeInstanceFromPool($criteria);
-
-            $affectedRows += ModelCriteria::delete($con);
-            OrderAttributeCombinationTableMap::clearRelatedInstancePool();
-            $con->commit();
-
-            return $affectedRows;
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-    }
-
-    // timestampable behavior
-
-    /**
-     * Filter by the latest updated
-     *
-     * @param      int $nbDays Maximum age of the latest update in days
-     *
-     * @return     ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function recentlyUpdated($nbDays = 7)
-    {
-        return $this->addUsingAlias(OrderAttributeCombinationTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
-    }
-
-    /**
-     * Filter by the latest created
-     *
-     * @param      int $nbDays Maximum age of in days
-     *
-     * @return     ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function recentlyCreated($nbDays = 7)
-    {
-        return $this->addUsingAlias(OrderAttributeCombinationTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
-    }
-
-    /**
-     * Order by update date desc
-     *
-     * @return     ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function lastUpdatedFirst()
-    {
-        return $this->addDescendingOrderByColumn(OrderAttributeCombinationTableMap::UPDATED_AT);
-    }
-
-    /**
-     * Order by update date asc
-     *
-     * @return     ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function firstUpdatedFirst()
-    {
-        return $this->addAscendingOrderByColumn(OrderAttributeCombinationTableMap::UPDATED_AT);
-    }
-
-    /**
-     * Order by create date desc
-     *
-     * @return     ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function lastCreatedFirst()
-    {
-        return $this->addDescendingOrderByColumn(OrderAttributeCombinationTableMap::CREATED_AT);
-    }
-
-    /**
-     * Order by create date asc
-     *
-     * @return     ChildOrderAttributeCombinationQuery The current query, for fluid interface
-     */
-    public function firstCreatedFirst()
-    {
-        return $this->addAscendingOrderByColumn(OrderAttributeCombinationTableMap::CREATED_AT);
-    }
-
-} // OrderAttributeCombinationQuery
diff --git a/core/lib/Thelia/Model/Base/OrderProduct.php b/core/lib/Thelia/Model/Base/OrderProduct.php
index 3d72eee6e..6ff03d427 100644
--- a/core/lib/Thelia/Model/Base/OrderProduct.php
+++ b/core/lib/Thelia/Model/Base/OrderProduct.php
@@ -18,10 +18,12 @@ use Propel\Runtime\Map\TableMap;
 use Propel\Runtime\Parser\AbstractParser;
 use Propel\Runtime\Util\PropelDateTime;
 use Thelia\Model\Order as ChildOrder;
-use Thelia\Model\OrderAttributeCombination as ChildOrderAttributeCombination;
-use Thelia\Model\OrderAttributeCombinationQuery as ChildOrderAttributeCombinationQuery;
 use Thelia\Model\OrderProduct as ChildOrderProduct;
+use Thelia\Model\OrderProductAttributeCombination as ChildOrderProductAttributeCombination;
+use Thelia\Model\OrderProductAttributeCombinationQuery as ChildOrderProductAttributeCombinationQuery;
 use Thelia\Model\OrderProductQuery as ChildOrderProductQuery;
+use Thelia\Model\OrderProductTax as ChildOrderProductTax;
+use Thelia\Model\OrderProductTaxQuery as ChildOrderProductTaxQuery;
 use Thelia\Model\OrderQuery as ChildOrderQuery;
 use Thelia\Model\Map\OrderProductTableMap;
 
@@ -144,10 +146,16 @@ abstract class OrderProduct implements ActiveRecordInterface
     protected $weight;
 
     /**
-     * The value for the tax field.
-     * @var        double
+     * The value for the tax_rule_title field.
+     * @var        string
      */
-    protected $tax;
+    protected $tax_rule_title;
+
+    /**
+     * The value for the tax_rule_description field.
+     * @var        string
+     */
+    protected $tax_rule_description;
 
     /**
      * The value for the parent field.
@@ -173,10 +181,16 @@ abstract class OrderProduct implements ActiveRecordInterface
     protected $aOrder;
 
     /**
-     * @var        ObjectCollection|ChildOrderAttributeCombination[] Collection to store aggregation of ChildOrderAttributeCombination objects.
+     * @var        ObjectCollection|ChildOrderProductAttributeCombination[] Collection to store aggregation of ChildOrderProductAttributeCombination objects.
      */
-    protected $collOrderAttributeCombinations;
-    protected $collOrderAttributeCombinationsPartial;
+    protected $collOrderProductAttributeCombinations;
+    protected $collOrderProductAttributeCombinationsPartial;
+
+    /**
+     * @var        ObjectCollection|ChildOrderProductTax[] Collection to store aggregation of ChildOrderProductTax objects.
+     */
+    protected $collOrderProductTaxes;
+    protected $collOrderProductTaxesPartial;
 
     /**
      * Flag to prevent endless save loop, if this object is referenced
@@ -190,7 +204,13 @@ abstract class OrderProduct implements ActiveRecordInterface
      * An array of objects scheduled for deletion.
      * @var ObjectCollection
      */
-    protected $orderAttributeCombinationsScheduledForDeletion = null;
+    protected $orderProductAttributeCombinationsScheduledForDeletion = null;
+
+    /**
+     * An array of objects scheduled for deletion.
+     * @var ObjectCollection
+     */
+    protected $orderProductTaxesScheduledForDeletion = null;
 
     /**
      * Initializes internal state of Thelia\Model\Base\OrderProduct object.
@@ -601,14 +621,25 @@ abstract class OrderProduct implements ActiveRecordInterface
     }
 
     /**
-     * Get the [tax] column value.
+     * Get the [tax_rule_title] column value.
      *
-     * @return   double
+     * @return   string
      */
-    public function getTax()
+    public function getTaxRuleTitle()
     {
 
-        return $this->tax;
+        return $this->tax_rule_title;
+    }
+
+    /**
+     * Get the [tax_rule_description] column value.
+     *
+     * @return   string
+     */
+    public function getTaxRuleDescription()
+    {
+
+        return $this->tax_rule_description;
     }
 
     /**
@@ -961,25 +992,46 @@ abstract class OrderProduct implements ActiveRecordInterface
     } // setWeight()
 
     /**
-     * Set the value of [tax] column.
+     * Set the value of [tax_rule_title] column.
      *
-     * @param      double $v new value
+     * @param      string $v new value
      * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
      */
-    public function setTax($v)
+    public function setTaxRuleTitle($v)
     {
         if ($v !== null) {
-            $v = (double) $v;
+            $v = (string) $v;
         }
 
-        if ($this->tax !== $v) {
-            $this->tax = $v;
-            $this->modifiedColumns[] = OrderProductTableMap::TAX;
+        if ($this->tax_rule_title !== $v) {
+            $this->tax_rule_title = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::TAX_RULE_TITLE;
         }
 
 
         return $this;
-    } // setTax()
+    } // setTaxRuleTitle()
+
+    /**
+     * Set the value of [tax_rule_description] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setTaxRuleDescription($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->tax_rule_description !== $v) {
+            $this->tax_rule_description = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::TAX_RULE_DESCRIPTION;
+        }
+
+
+        return $this;
+    } // setTaxRuleDescription()
 
     /**
      * Set the value of [parent] column.
@@ -1123,19 +1175,22 @@ abstract class OrderProduct implements ActiveRecordInterface
             $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : OrderProductTableMap::translateFieldName('Weight', TableMap::TYPE_PHPNAME, $indexType)];
             $this->weight = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : OrderProductTableMap::translateFieldName('Tax', TableMap::TYPE_PHPNAME, $indexType)];
-            $this->tax = (null !== $col) ? (double) $col : null;
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : OrderProductTableMap::translateFieldName('TaxRuleTitle', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->tax_rule_title = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 15 + $startcol : OrderProductTableMap::translateFieldName('Parent', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 15 + $startcol : OrderProductTableMap::translateFieldName('TaxRuleDescription', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->tax_rule_description = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 16 + $startcol : OrderProductTableMap::translateFieldName('Parent', TableMap::TYPE_PHPNAME, $indexType)];
             $this->parent = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 16 + $startcol : OrderProductTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 17 + $startcol : OrderProductTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
             $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 17 + $startcol : OrderProductTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 18 + $startcol : OrderProductTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
@@ -1148,7 +1203,7 @@ abstract class OrderProduct implements ActiveRecordInterface
                 $this->ensureConsistency();
             }
 
-            return $startcol + 18; // 18 = OrderProductTableMap::NUM_HYDRATE_COLUMNS.
+            return $startcol + 19; // 19 = OrderProductTableMap::NUM_HYDRATE_COLUMNS.
 
         } catch (Exception $e) {
             throw new PropelException("Error populating \Thelia\Model\OrderProduct object", 0, $e);
@@ -1213,7 +1268,9 @@ abstract class OrderProduct implements ActiveRecordInterface
         if ($deep) {  // also de-associate any related objects?
 
             $this->aOrder = null;
-            $this->collOrderAttributeCombinations = null;
+            $this->collOrderProductAttributeCombinations = null;
+
+            $this->collOrderProductTaxes = null;
 
         } // if (deep)
     }
@@ -1360,17 +1417,34 @@ abstract class OrderProduct implements ActiveRecordInterface
                 $this->resetModified();
             }
 
-            if ($this->orderAttributeCombinationsScheduledForDeletion !== null) {
-                if (!$this->orderAttributeCombinationsScheduledForDeletion->isEmpty()) {
-                    \Thelia\Model\OrderAttributeCombinationQuery::create()
-                        ->filterByPrimaryKeys($this->orderAttributeCombinationsScheduledForDeletion->getPrimaryKeys(false))
+            if ($this->orderProductAttributeCombinationsScheduledForDeletion !== null) {
+                if (!$this->orderProductAttributeCombinationsScheduledForDeletion->isEmpty()) {
+                    \Thelia\Model\OrderProductAttributeCombinationQuery::create()
+                        ->filterByPrimaryKeys($this->orderProductAttributeCombinationsScheduledForDeletion->getPrimaryKeys(false))
                         ->delete($con);
-                    $this->orderAttributeCombinationsScheduledForDeletion = null;
+                    $this->orderProductAttributeCombinationsScheduledForDeletion = null;
                 }
             }
 
-                if ($this->collOrderAttributeCombinations !== null) {
-            foreach ($this->collOrderAttributeCombinations as $referrerFK) {
+                if ($this->collOrderProductAttributeCombinations !== null) {
+            foreach ($this->collOrderProductAttributeCombinations as $referrerFK) {
+                    if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
+                        $affectedRows += $referrerFK->save($con);
+                    }
+                }
+            }
+
+            if ($this->orderProductTaxesScheduledForDeletion !== null) {
+                if (!$this->orderProductTaxesScheduledForDeletion->isEmpty()) {
+                    \Thelia\Model\OrderProductTaxQuery::create()
+                        ->filterByPrimaryKeys($this->orderProductTaxesScheduledForDeletion->getPrimaryKeys(false))
+                        ->delete($con);
+                    $this->orderProductTaxesScheduledForDeletion = null;
+                }
+            }
+
+                if ($this->collOrderProductTaxes !== null) {
+            foreach ($this->collOrderProductTaxes as $referrerFK) {
                     if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
                         $affectedRows += $referrerFK->save($con);
                     }
@@ -1445,8 +1519,11 @@ abstract class OrderProduct implements ActiveRecordInterface
         if ($this->isColumnModified(OrderProductTableMap::WEIGHT)) {
             $modifiedColumns[':p' . $index++]  = 'WEIGHT';
         }
-        if ($this->isColumnModified(OrderProductTableMap::TAX)) {
-            $modifiedColumns[':p' . $index++]  = 'TAX';
+        if ($this->isColumnModified(OrderProductTableMap::TAX_RULE_TITLE)) {
+            $modifiedColumns[':p' . $index++]  = 'TAX_RULE_TITLE';
+        }
+        if ($this->isColumnModified(OrderProductTableMap::TAX_RULE_DESCRIPTION)) {
+            $modifiedColumns[':p' . $index++]  = 'TAX_RULE_DESCRIPTION';
         }
         if ($this->isColumnModified(OrderProductTableMap::PARENT)) {
             $modifiedColumns[':p' . $index++]  = 'PARENT';
@@ -1510,8 +1587,11 @@ abstract class OrderProduct implements ActiveRecordInterface
                     case 'WEIGHT':
                         $stmt->bindValue($identifier, $this->weight, PDO::PARAM_STR);
                         break;
-                    case 'TAX':
-                        $stmt->bindValue($identifier, $this->tax, PDO::PARAM_STR);
+                    case 'TAX_RULE_TITLE':
+                        $stmt->bindValue($identifier, $this->tax_rule_title, PDO::PARAM_STR);
+                        break;
+                    case 'TAX_RULE_DESCRIPTION':
+                        $stmt->bindValue($identifier, $this->tax_rule_description, PDO::PARAM_STR);
                         break;
                     case 'PARENT':
                         $stmt->bindValue($identifier, $this->parent, PDO::PARAM_INT);
@@ -1627,15 +1707,18 @@ abstract class OrderProduct implements ActiveRecordInterface
                 return $this->getWeight();
                 break;
             case 14:
-                return $this->getTax();
+                return $this->getTaxRuleTitle();
                 break;
             case 15:
-                return $this->getParent();
+                return $this->getTaxRuleDescription();
                 break;
             case 16:
-                return $this->getCreatedAt();
+                return $this->getParent();
                 break;
             case 17:
+                return $this->getCreatedAt();
+                break;
+            case 18:
                 return $this->getUpdatedAt();
                 break;
             default:
@@ -1681,10 +1764,11 @@ abstract class OrderProduct implements ActiveRecordInterface
             $keys[11] => $this->getWasNew(),
             $keys[12] => $this->getWasInPromo(),
             $keys[13] => $this->getWeight(),
-            $keys[14] => $this->getTax(),
-            $keys[15] => $this->getParent(),
-            $keys[16] => $this->getCreatedAt(),
-            $keys[17] => $this->getUpdatedAt(),
+            $keys[14] => $this->getTaxRuleTitle(),
+            $keys[15] => $this->getTaxRuleDescription(),
+            $keys[16] => $this->getParent(),
+            $keys[17] => $this->getCreatedAt(),
+            $keys[18] => $this->getUpdatedAt(),
         );
         $virtualColumns = $this->virtualColumns;
         foreach($virtualColumns as $key => $virtualColumn)
@@ -1696,8 +1780,11 @@ abstract class OrderProduct implements ActiveRecordInterface
             if (null !== $this->aOrder) {
                 $result['Order'] = $this->aOrder->toArray($keyType, $includeLazyLoadColumns,  $alreadyDumpedObjects, true);
             }
-            if (null !== $this->collOrderAttributeCombinations) {
-                $result['OrderAttributeCombinations'] = $this->collOrderAttributeCombinations->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+            if (null !== $this->collOrderProductAttributeCombinations) {
+                $result['OrderProductAttributeCombinations'] = $this->collOrderProductAttributeCombinations->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+            }
+            if (null !== $this->collOrderProductTaxes) {
+                $result['OrderProductTaxes'] = $this->collOrderProductTaxes->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
             }
         }
 
@@ -1776,15 +1863,18 @@ abstract class OrderProduct implements ActiveRecordInterface
                 $this->setWeight($value);
                 break;
             case 14:
-                $this->setTax($value);
+                $this->setTaxRuleTitle($value);
                 break;
             case 15:
-                $this->setParent($value);
+                $this->setTaxRuleDescription($value);
                 break;
             case 16:
-                $this->setCreatedAt($value);
+                $this->setParent($value);
                 break;
             case 17:
+                $this->setCreatedAt($value);
+                break;
+            case 18:
                 $this->setUpdatedAt($value);
                 break;
         } // switch()
@@ -1825,10 +1915,11 @@ abstract class OrderProduct implements ActiveRecordInterface
         if (array_key_exists($keys[11], $arr)) $this->setWasNew($arr[$keys[11]]);
         if (array_key_exists($keys[12], $arr)) $this->setWasInPromo($arr[$keys[12]]);
         if (array_key_exists($keys[13], $arr)) $this->setWeight($arr[$keys[13]]);
-        if (array_key_exists($keys[14], $arr)) $this->setTax($arr[$keys[14]]);
-        if (array_key_exists($keys[15], $arr)) $this->setParent($arr[$keys[15]]);
-        if (array_key_exists($keys[16], $arr)) $this->setCreatedAt($arr[$keys[16]]);
-        if (array_key_exists($keys[17], $arr)) $this->setUpdatedAt($arr[$keys[17]]);
+        if (array_key_exists($keys[14], $arr)) $this->setTaxRuleTitle($arr[$keys[14]]);
+        if (array_key_exists($keys[15], $arr)) $this->setTaxRuleDescription($arr[$keys[15]]);
+        if (array_key_exists($keys[16], $arr)) $this->setParent($arr[$keys[16]]);
+        if (array_key_exists($keys[17], $arr)) $this->setCreatedAt($arr[$keys[17]]);
+        if (array_key_exists($keys[18], $arr)) $this->setUpdatedAt($arr[$keys[18]]);
     }
 
     /**
@@ -1854,7 +1945,8 @@ abstract class OrderProduct implements ActiveRecordInterface
         if ($this->isColumnModified(OrderProductTableMap::WAS_NEW)) $criteria->add(OrderProductTableMap::WAS_NEW, $this->was_new);
         if ($this->isColumnModified(OrderProductTableMap::WAS_IN_PROMO)) $criteria->add(OrderProductTableMap::WAS_IN_PROMO, $this->was_in_promo);
         if ($this->isColumnModified(OrderProductTableMap::WEIGHT)) $criteria->add(OrderProductTableMap::WEIGHT, $this->weight);
-        if ($this->isColumnModified(OrderProductTableMap::TAX)) $criteria->add(OrderProductTableMap::TAX, $this->tax);
+        if ($this->isColumnModified(OrderProductTableMap::TAX_RULE_TITLE)) $criteria->add(OrderProductTableMap::TAX_RULE_TITLE, $this->tax_rule_title);
+        if ($this->isColumnModified(OrderProductTableMap::TAX_RULE_DESCRIPTION)) $criteria->add(OrderProductTableMap::TAX_RULE_DESCRIPTION, $this->tax_rule_description);
         if ($this->isColumnModified(OrderProductTableMap::PARENT)) $criteria->add(OrderProductTableMap::PARENT, $this->parent);
         if ($this->isColumnModified(OrderProductTableMap::CREATED_AT)) $criteria->add(OrderProductTableMap::CREATED_AT, $this->created_at);
         if ($this->isColumnModified(OrderProductTableMap::UPDATED_AT)) $criteria->add(OrderProductTableMap::UPDATED_AT, $this->updated_at);
@@ -1934,7 +2026,8 @@ abstract class OrderProduct implements ActiveRecordInterface
         $copyObj->setWasNew($this->getWasNew());
         $copyObj->setWasInPromo($this->getWasInPromo());
         $copyObj->setWeight($this->getWeight());
-        $copyObj->setTax($this->getTax());
+        $copyObj->setTaxRuleTitle($this->getTaxRuleTitle());
+        $copyObj->setTaxRuleDescription($this->getTaxRuleDescription());
         $copyObj->setParent($this->getParent());
         $copyObj->setCreatedAt($this->getCreatedAt());
         $copyObj->setUpdatedAt($this->getUpdatedAt());
@@ -1944,9 +2037,15 @@ abstract class OrderProduct implements ActiveRecordInterface
             // the getter/setter methods for fkey referrer objects.
             $copyObj->setNew(false);
 
-            foreach ($this->getOrderAttributeCombinations() as $relObj) {
+            foreach ($this->getOrderProductAttributeCombinations() as $relObj) {
                 if ($relObj !== $this) {  // ensure that we don't try to copy a reference to ourselves
-                    $copyObj->addOrderAttributeCombination($relObj->copy($deepCopy));
+                    $copyObj->addOrderProductAttributeCombination($relObj->copy($deepCopy));
+                }
+            }
+
+            foreach ($this->getOrderProductTaxes() as $relObj) {
+                if ($relObj !== $this) {  // ensure that we don't try to copy a reference to ourselves
+                    $copyObj->addOrderProductTax($relObj->copy($deepCopy));
                 }
             }
 
@@ -2042,37 +2141,40 @@ abstract class OrderProduct implements ActiveRecordInterface
      */
     public function initRelation($relationName)
     {
-        if ('OrderAttributeCombination' == $relationName) {
-            return $this->initOrderAttributeCombinations();
+        if ('OrderProductAttributeCombination' == $relationName) {
+            return $this->initOrderProductAttributeCombinations();
+        }
+        if ('OrderProductTax' == $relationName) {
+            return $this->initOrderProductTaxes();
         }
     }
 
     /**
-     * Clears out the collOrderAttributeCombinations collection
+     * Clears out the collOrderProductAttributeCombinations collection
      *
      * This does not modify the database; however, it will remove any associated objects, causing
      * them to be refetched by subsequent calls to accessor method.
      *
      * @return void
-     * @see        addOrderAttributeCombinations()
+     * @see        addOrderProductAttributeCombinations()
      */
-    public function clearOrderAttributeCombinations()
+    public function clearOrderProductAttributeCombinations()
     {
-        $this->collOrderAttributeCombinations = null; // important to set this to NULL since that means it is uninitialized
+        $this->collOrderProductAttributeCombinations = null; // important to set this to NULL since that means it is uninitialized
     }
 
     /**
-     * Reset is the collOrderAttributeCombinations collection loaded partially.
+     * Reset is the collOrderProductAttributeCombinations collection loaded partially.
      */
-    public function resetPartialOrderAttributeCombinations($v = true)
+    public function resetPartialOrderProductAttributeCombinations($v = true)
     {
-        $this->collOrderAttributeCombinationsPartial = $v;
+        $this->collOrderProductAttributeCombinationsPartial = $v;
     }
 
     /**
-     * Initializes the collOrderAttributeCombinations collection.
+     * Initializes the collOrderProductAttributeCombinations collection.
      *
-     * By default this just sets the collOrderAttributeCombinations collection to an empty array (like clearcollOrderAttributeCombinations());
+     * By default this just sets the collOrderProductAttributeCombinations collection to an empty array (like clearcollOrderProductAttributeCombinations());
      * however, you may wish to override this method in your stub class to provide setting appropriate
      * to your application -- for example, setting the initial array to the values stored in database.
      *
@@ -2081,17 +2183,17 @@ abstract class OrderProduct implements ActiveRecordInterface
      *
      * @return void
      */
-    public function initOrderAttributeCombinations($overrideExisting = true)
+    public function initOrderProductAttributeCombinations($overrideExisting = true)
     {
-        if (null !== $this->collOrderAttributeCombinations && !$overrideExisting) {
+        if (null !== $this->collOrderProductAttributeCombinations && !$overrideExisting) {
             return;
         }
-        $this->collOrderAttributeCombinations = new ObjectCollection();
-        $this->collOrderAttributeCombinations->setModel('\Thelia\Model\OrderAttributeCombination');
+        $this->collOrderProductAttributeCombinations = new ObjectCollection();
+        $this->collOrderProductAttributeCombinations->setModel('\Thelia\Model\OrderProductAttributeCombination');
     }
 
     /**
-     * Gets an array of ChildOrderAttributeCombination objects which contain a foreign key that references this object.
+     * Gets an array of ChildOrderProductAttributeCombination objects which contain a foreign key that references this object.
      *
      * If the $criteria is not null, it is used to always fetch the results from the database.
      * Otherwise the results are fetched from the database the first time, then cached.
@@ -2101,109 +2203,109 @@ abstract class OrderProduct implements ActiveRecordInterface
      *
      * @param      Criteria $criteria optional Criteria object to narrow the query
      * @param      ConnectionInterface $con optional connection object
-     * @return Collection|ChildOrderAttributeCombination[] List of ChildOrderAttributeCombination objects
+     * @return Collection|ChildOrderProductAttributeCombination[] List of ChildOrderProductAttributeCombination objects
      * @throws PropelException
      */
-    public function getOrderAttributeCombinations($criteria = null, ConnectionInterface $con = null)
+    public function getOrderProductAttributeCombinations($criteria = null, ConnectionInterface $con = null)
     {
-        $partial = $this->collOrderAttributeCombinationsPartial && !$this->isNew();
-        if (null === $this->collOrderAttributeCombinations || null !== $criteria  || $partial) {
-            if ($this->isNew() && null === $this->collOrderAttributeCombinations) {
+        $partial = $this->collOrderProductAttributeCombinationsPartial && !$this->isNew();
+        if (null === $this->collOrderProductAttributeCombinations || null !== $criteria  || $partial) {
+            if ($this->isNew() && null === $this->collOrderProductAttributeCombinations) {
                 // return empty collection
-                $this->initOrderAttributeCombinations();
+                $this->initOrderProductAttributeCombinations();
             } else {
-                $collOrderAttributeCombinations = ChildOrderAttributeCombinationQuery::create(null, $criteria)
+                $collOrderProductAttributeCombinations = ChildOrderProductAttributeCombinationQuery::create(null, $criteria)
                     ->filterByOrderProduct($this)
                     ->find($con);
 
                 if (null !== $criteria) {
-                    if (false !== $this->collOrderAttributeCombinationsPartial && count($collOrderAttributeCombinations)) {
-                        $this->initOrderAttributeCombinations(false);
+                    if (false !== $this->collOrderProductAttributeCombinationsPartial && count($collOrderProductAttributeCombinations)) {
+                        $this->initOrderProductAttributeCombinations(false);
 
-                        foreach ($collOrderAttributeCombinations as $obj) {
-                            if (false == $this->collOrderAttributeCombinations->contains($obj)) {
-                                $this->collOrderAttributeCombinations->append($obj);
+                        foreach ($collOrderProductAttributeCombinations as $obj) {
+                            if (false == $this->collOrderProductAttributeCombinations->contains($obj)) {
+                                $this->collOrderProductAttributeCombinations->append($obj);
                             }
                         }
 
-                        $this->collOrderAttributeCombinationsPartial = true;
+                        $this->collOrderProductAttributeCombinationsPartial = true;
                     }
 
-                    $collOrderAttributeCombinations->getInternalIterator()->rewind();
+                    $collOrderProductAttributeCombinations->getInternalIterator()->rewind();
 
-                    return $collOrderAttributeCombinations;
+                    return $collOrderProductAttributeCombinations;
                 }
 
-                if ($partial && $this->collOrderAttributeCombinations) {
-                    foreach ($this->collOrderAttributeCombinations as $obj) {
+                if ($partial && $this->collOrderProductAttributeCombinations) {
+                    foreach ($this->collOrderProductAttributeCombinations as $obj) {
                         if ($obj->isNew()) {
-                            $collOrderAttributeCombinations[] = $obj;
+                            $collOrderProductAttributeCombinations[] = $obj;
                         }
                     }
                 }
 
-                $this->collOrderAttributeCombinations = $collOrderAttributeCombinations;
-                $this->collOrderAttributeCombinationsPartial = false;
+                $this->collOrderProductAttributeCombinations = $collOrderProductAttributeCombinations;
+                $this->collOrderProductAttributeCombinationsPartial = false;
             }
         }
 
-        return $this->collOrderAttributeCombinations;
+        return $this->collOrderProductAttributeCombinations;
     }
 
     /**
-     * Sets a collection of OrderAttributeCombination objects related by a one-to-many relationship
+     * Sets a collection of OrderProductAttributeCombination objects related by a one-to-many relationship
      * to the current object.
      * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
      * and new objects from the given Propel collection.
      *
-     * @param      Collection $orderAttributeCombinations A Propel collection.
+     * @param      Collection $orderProductAttributeCombinations A Propel collection.
      * @param      ConnectionInterface $con Optional connection object
      * @return   ChildOrderProduct The current object (for fluent API support)
      */
-    public function setOrderAttributeCombinations(Collection $orderAttributeCombinations, ConnectionInterface $con = null)
+    public function setOrderProductAttributeCombinations(Collection $orderProductAttributeCombinations, ConnectionInterface $con = null)
     {
-        $orderAttributeCombinationsToDelete = $this->getOrderAttributeCombinations(new Criteria(), $con)->diff($orderAttributeCombinations);
+        $orderProductAttributeCombinationsToDelete = $this->getOrderProductAttributeCombinations(new Criteria(), $con)->diff($orderProductAttributeCombinations);
 
 
-        $this->orderAttributeCombinationsScheduledForDeletion = $orderAttributeCombinationsToDelete;
+        $this->orderProductAttributeCombinationsScheduledForDeletion = $orderProductAttributeCombinationsToDelete;
 
-        foreach ($orderAttributeCombinationsToDelete as $orderAttributeCombinationRemoved) {
-            $orderAttributeCombinationRemoved->setOrderProduct(null);
+        foreach ($orderProductAttributeCombinationsToDelete as $orderProductAttributeCombinationRemoved) {
+            $orderProductAttributeCombinationRemoved->setOrderProduct(null);
         }
 
-        $this->collOrderAttributeCombinations = null;
-        foreach ($orderAttributeCombinations as $orderAttributeCombination) {
-            $this->addOrderAttributeCombination($orderAttributeCombination);
+        $this->collOrderProductAttributeCombinations = null;
+        foreach ($orderProductAttributeCombinations as $orderProductAttributeCombination) {
+            $this->addOrderProductAttributeCombination($orderProductAttributeCombination);
         }
 
-        $this->collOrderAttributeCombinations = $orderAttributeCombinations;
-        $this->collOrderAttributeCombinationsPartial = false;
+        $this->collOrderProductAttributeCombinations = $orderProductAttributeCombinations;
+        $this->collOrderProductAttributeCombinationsPartial = false;
 
         return $this;
     }
 
     /**
-     * Returns the number of related OrderAttributeCombination objects.
+     * Returns the number of related OrderProductAttributeCombination objects.
      *
      * @param      Criteria $criteria
      * @param      boolean $distinct
      * @param      ConnectionInterface $con
-     * @return int             Count of related OrderAttributeCombination objects.
+     * @return int             Count of related OrderProductAttributeCombination objects.
      * @throws PropelException
      */
-    public function countOrderAttributeCombinations(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
+    public function countOrderProductAttributeCombinations(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
     {
-        $partial = $this->collOrderAttributeCombinationsPartial && !$this->isNew();
-        if (null === $this->collOrderAttributeCombinations || null !== $criteria || $partial) {
-            if ($this->isNew() && null === $this->collOrderAttributeCombinations) {
+        $partial = $this->collOrderProductAttributeCombinationsPartial && !$this->isNew();
+        if (null === $this->collOrderProductAttributeCombinations || null !== $criteria || $partial) {
+            if ($this->isNew() && null === $this->collOrderProductAttributeCombinations) {
                 return 0;
             }
 
             if ($partial && !$criteria) {
-                return count($this->getOrderAttributeCombinations());
+                return count($this->getOrderProductAttributeCombinations());
             }
 
-            $query = ChildOrderAttributeCombinationQuery::create(null, $criteria);
+            $query = ChildOrderProductAttributeCombinationQuery::create(null, $criteria);
             if ($distinct) {
                 $query->distinct();
             }
@@ -2213,53 +2315,271 @@ abstract class OrderProduct implements ActiveRecordInterface
                 ->count($con);
         }
 
-        return count($this->collOrderAttributeCombinations);
+        return count($this->collOrderProductAttributeCombinations);
     }
 
     /**
-     * Method called to associate a ChildOrderAttributeCombination object to this object
-     * through the ChildOrderAttributeCombination foreign key attribute.
+     * Method called to associate a ChildOrderProductAttributeCombination object to this object
+     * through the ChildOrderProductAttributeCombination foreign key attribute.
      *
-     * @param    ChildOrderAttributeCombination $l ChildOrderAttributeCombination
+     * @param    ChildOrderProductAttributeCombination $l ChildOrderProductAttributeCombination
      * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
      */
-    public function addOrderAttributeCombination(ChildOrderAttributeCombination $l)
+    public function addOrderProductAttributeCombination(ChildOrderProductAttributeCombination $l)
     {
-        if ($this->collOrderAttributeCombinations === null) {
-            $this->initOrderAttributeCombinations();
-            $this->collOrderAttributeCombinationsPartial = true;
+        if ($this->collOrderProductAttributeCombinations === null) {
+            $this->initOrderProductAttributeCombinations();
+            $this->collOrderProductAttributeCombinationsPartial = true;
         }
 
-        if (!in_array($l, $this->collOrderAttributeCombinations->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
-            $this->doAddOrderAttributeCombination($l);
+        if (!in_array($l, $this->collOrderProductAttributeCombinations->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
+            $this->doAddOrderProductAttributeCombination($l);
         }
 
         return $this;
     }
 
     /**
-     * @param OrderAttributeCombination $orderAttributeCombination The orderAttributeCombination object to add.
+     * @param OrderProductAttributeCombination $orderProductAttributeCombination The orderProductAttributeCombination object to add.
      */
-    protected function doAddOrderAttributeCombination($orderAttributeCombination)
+    protected function doAddOrderProductAttributeCombination($orderProductAttributeCombination)
     {
-        $this->collOrderAttributeCombinations[]= $orderAttributeCombination;
-        $orderAttributeCombination->setOrderProduct($this);
+        $this->collOrderProductAttributeCombinations[]= $orderProductAttributeCombination;
+        $orderProductAttributeCombination->setOrderProduct($this);
     }
 
     /**
-     * @param  OrderAttributeCombination $orderAttributeCombination The orderAttributeCombination object to remove.
+     * @param  OrderProductAttributeCombination $orderProductAttributeCombination The orderProductAttributeCombination object to remove.
      * @return ChildOrderProduct The current object (for fluent API support)
      */
-    public function removeOrderAttributeCombination($orderAttributeCombination)
+    public function removeOrderProductAttributeCombination($orderProductAttributeCombination)
     {
-        if ($this->getOrderAttributeCombinations()->contains($orderAttributeCombination)) {
-            $this->collOrderAttributeCombinations->remove($this->collOrderAttributeCombinations->search($orderAttributeCombination));
-            if (null === $this->orderAttributeCombinationsScheduledForDeletion) {
-                $this->orderAttributeCombinationsScheduledForDeletion = clone $this->collOrderAttributeCombinations;
-                $this->orderAttributeCombinationsScheduledForDeletion->clear();
+        if ($this->getOrderProductAttributeCombinations()->contains($orderProductAttributeCombination)) {
+            $this->collOrderProductAttributeCombinations->remove($this->collOrderProductAttributeCombinations->search($orderProductAttributeCombination));
+            if (null === $this->orderProductAttributeCombinationsScheduledForDeletion) {
+                $this->orderProductAttributeCombinationsScheduledForDeletion = clone $this->collOrderProductAttributeCombinations;
+                $this->orderProductAttributeCombinationsScheduledForDeletion->clear();
             }
-            $this->orderAttributeCombinationsScheduledForDeletion[]= clone $orderAttributeCombination;
-            $orderAttributeCombination->setOrderProduct(null);
+            $this->orderProductAttributeCombinationsScheduledForDeletion[]= clone $orderProductAttributeCombination;
+            $orderProductAttributeCombination->setOrderProduct(null);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Clears out the collOrderProductTaxes collection
+     *
+     * This does not modify the database; however, it will remove any associated objects, causing
+     * them to be refetched by subsequent calls to accessor method.
+     *
+     * @return void
+     * @see        addOrderProductTaxes()
+     */
+    public function clearOrderProductTaxes()
+    {
+        $this->collOrderProductTaxes = null; // important to set this to NULL since that means it is uninitialized
+    }
+
+    /**
+     * Reset is the collOrderProductTaxes collection loaded partially.
+     */
+    public function resetPartialOrderProductTaxes($v = true)
+    {
+        $this->collOrderProductTaxesPartial = $v;
+    }
+
+    /**
+     * Initializes the collOrderProductTaxes collection.
+     *
+     * By default this just sets the collOrderProductTaxes collection to an empty array (like clearcollOrderProductTaxes());
+     * however, you may wish to override this method in your stub class to provide setting appropriate
+     * to your application -- for example, setting the initial array to the values stored in database.
+     *
+     * @param      boolean $overrideExisting If set to true, the method call initializes
+     *                                        the collection even if it is not empty
+     *
+     * @return void
+     */
+    public function initOrderProductTaxes($overrideExisting = true)
+    {
+        if (null !== $this->collOrderProductTaxes && !$overrideExisting) {
+            return;
+        }
+        $this->collOrderProductTaxes = new ObjectCollection();
+        $this->collOrderProductTaxes->setModel('\Thelia\Model\OrderProductTax');
+    }
+
+    /**
+     * Gets an array of ChildOrderProductTax objects which contain a foreign key that references this object.
+     *
+     * If the $criteria is not null, it is used to always fetch the results from the database.
+     * Otherwise the results are fetched from the database the first time, then cached.
+     * Next time the same method is called without $criteria, the cached collection is returned.
+     * If this ChildOrderProduct is new, it will return
+     * an empty collection or the current collection; the criteria is ignored on a new object.
+     *
+     * @param      Criteria $criteria optional Criteria object to narrow the query
+     * @param      ConnectionInterface $con optional connection object
+     * @return Collection|ChildOrderProductTax[] List of ChildOrderProductTax objects
+     * @throws PropelException
+     */
+    public function getOrderProductTaxes($criteria = null, ConnectionInterface $con = null)
+    {
+        $partial = $this->collOrderProductTaxesPartial && !$this->isNew();
+        if (null === $this->collOrderProductTaxes || null !== $criteria  || $partial) {
+            if ($this->isNew() && null === $this->collOrderProductTaxes) {
+                // return empty collection
+                $this->initOrderProductTaxes();
+            } else {
+                $collOrderProductTaxes = ChildOrderProductTaxQuery::create(null, $criteria)
+                    ->filterByOrderProduct($this)
+                    ->find($con);
+
+                if (null !== $criteria) {
+                    if (false !== $this->collOrderProductTaxesPartial && count($collOrderProductTaxes)) {
+                        $this->initOrderProductTaxes(false);
+
+                        foreach ($collOrderProductTaxes as $obj) {
+                            if (false == $this->collOrderProductTaxes->contains($obj)) {
+                                $this->collOrderProductTaxes->append($obj);
+                            }
+                        }
+
+                        $this->collOrderProductTaxesPartial = true;
+                    }
+
+                    $collOrderProductTaxes->getInternalIterator()->rewind();
+
+                    return $collOrderProductTaxes;
+                }
+
+                if ($partial && $this->collOrderProductTaxes) {
+                    foreach ($this->collOrderProductTaxes as $obj) {
+                        if ($obj->isNew()) {
+                            $collOrderProductTaxes[] = $obj;
+                        }
+                    }
+                }
+
+                $this->collOrderProductTaxes = $collOrderProductTaxes;
+                $this->collOrderProductTaxesPartial = false;
+            }
+        }
+
+        return $this->collOrderProductTaxes;
+    }
+
+    /**
+     * Sets a collection of OrderProductTax objects related by a one-to-many relationship
+     * to the current object.
+     * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+     * and new objects from the given Propel collection.
+     *
+     * @param      Collection $orderProductTaxes A Propel collection.
+     * @param      ConnectionInterface $con Optional connection object
+     * @return   ChildOrderProduct The current object (for fluent API support)
+     */
+    public function setOrderProductTaxes(Collection $orderProductTaxes, ConnectionInterface $con = null)
+    {
+        $orderProductTaxesToDelete = $this->getOrderProductTaxes(new Criteria(), $con)->diff($orderProductTaxes);
+
+
+        $this->orderProductTaxesScheduledForDeletion = $orderProductTaxesToDelete;
+
+        foreach ($orderProductTaxesToDelete as $orderProductTaxRemoved) {
+            $orderProductTaxRemoved->setOrderProduct(null);
+        }
+
+        $this->collOrderProductTaxes = null;
+        foreach ($orderProductTaxes as $orderProductTax) {
+            $this->addOrderProductTax($orderProductTax);
+        }
+
+        $this->collOrderProductTaxes = $orderProductTaxes;
+        $this->collOrderProductTaxesPartial = false;
+
+        return $this;
+    }
+
+    /**
+     * Returns the number of related OrderProductTax objects.
+     *
+     * @param      Criteria $criteria
+     * @param      boolean $distinct
+     * @param      ConnectionInterface $con
+     * @return int             Count of related OrderProductTax objects.
+     * @throws PropelException
+     */
+    public function countOrderProductTaxes(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
+    {
+        $partial = $this->collOrderProductTaxesPartial && !$this->isNew();
+        if (null === $this->collOrderProductTaxes || null !== $criteria || $partial) {
+            if ($this->isNew() && null === $this->collOrderProductTaxes) {
+                return 0;
+            }
+
+            if ($partial && !$criteria) {
+                return count($this->getOrderProductTaxes());
+            }
+
+            $query = ChildOrderProductTaxQuery::create(null, $criteria);
+            if ($distinct) {
+                $query->distinct();
+            }
+
+            return $query
+                ->filterByOrderProduct($this)
+                ->count($con);
+        }
+
+        return count($this->collOrderProductTaxes);
+    }
+
+    /**
+     * Method called to associate a ChildOrderProductTax object to this object
+     * through the ChildOrderProductTax foreign key attribute.
+     *
+     * @param    ChildOrderProductTax $l ChildOrderProductTax
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function addOrderProductTax(ChildOrderProductTax $l)
+    {
+        if ($this->collOrderProductTaxes === null) {
+            $this->initOrderProductTaxes();
+            $this->collOrderProductTaxesPartial = true;
+        }
+
+        if (!in_array($l, $this->collOrderProductTaxes->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
+            $this->doAddOrderProductTax($l);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param OrderProductTax $orderProductTax The orderProductTax object to add.
+     */
+    protected function doAddOrderProductTax($orderProductTax)
+    {
+        $this->collOrderProductTaxes[]= $orderProductTax;
+        $orderProductTax->setOrderProduct($this);
+    }
+
+    /**
+     * @param  OrderProductTax $orderProductTax The orderProductTax object to remove.
+     * @return ChildOrderProduct The current object (for fluent API support)
+     */
+    public function removeOrderProductTax($orderProductTax)
+    {
+        if ($this->getOrderProductTaxes()->contains($orderProductTax)) {
+            $this->collOrderProductTaxes->remove($this->collOrderProductTaxes->search($orderProductTax));
+            if (null === $this->orderProductTaxesScheduledForDeletion) {
+                $this->orderProductTaxesScheduledForDeletion = clone $this->collOrderProductTaxes;
+                $this->orderProductTaxesScheduledForDeletion->clear();
+            }
+            $this->orderProductTaxesScheduledForDeletion[]= clone $orderProductTax;
+            $orderProductTax->setOrderProduct(null);
         }
 
         return $this;
@@ -2284,7 +2604,8 @@ abstract class OrderProduct implements ActiveRecordInterface
         $this->was_new = null;
         $this->was_in_promo = null;
         $this->weight = null;
-        $this->tax = null;
+        $this->tax_rule_title = null;
+        $this->tax_rule_description = null;
         $this->parent = null;
         $this->created_at = null;
         $this->updated_at = null;
@@ -2307,17 +2628,26 @@ abstract class OrderProduct implements ActiveRecordInterface
     public function clearAllReferences($deep = false)
     {
         if ($deep) {
-            if ($this->collOrderAttributeCombinations) {
-                foreach ($this->collOrderAttributeCombinations as $o) {
+            if ($this->collOrderProductAttributeCombinations) {
+                foreach ($this->collOrderProductAttributeCombinations as $o) {
+                    $o->clearAllReferences($deep);
+                }
+            }
+            if ($this->collOrderProductTaxes) {
+                foreach ($this->collOrderProductTaxes as $o) {
                     $o->clearAllReferences($deep);
                 }
             }
         } // if ($deep)
 
-        if ($this->collOrderAttributeCombinations instanceof Collection) {
-            $this->collOrderAttributeCombinations->clearIterator();
+        if ($this->collOrderProductAttributeCombinations instanceof Collection) {
+            $this->collOrderProductAttributeCombinations->clearIterator();
         }
-        $this->collOrderAttributeCombinations = null;
+        $this->collOrderProductAttributeCombinations = null;
+        if ($this->collOrderProductTaxes instanceof Collection) {
+            $this->collOrderProductTaxes->clearIterator();
+        }
+        $this->collOrderProductTaxes = null;
         $this->aOrder = null;
     }
 
diff --git a/core/lib/Thelia/Model/Base/OrderProductQuery.php b/core/lib/Thelia/Model/Base/OrderProductQuery.php
index b471fc359..f28102dfb 100644
--- a/core/lib/Thelia/Model/Base/OrderProductQuery.php
+++ b/core/lib/Thelia/Model/Base/OrderProductQuery.php
@@ -35,7 +35,8 @@ use Thelia\Model\Map\OrderProductTableMap;
  * @method     ChildOrderProductQuery orderByWasNew($order = Criteria::ASC) Order by the was_new column
  * @method     ChildOrderProductQuery orderByWasInPromo($order = Criteria::ASC) Order by the was_in_promo column
  * @method     ChildOrderProductQuery orderByWeight($order = Criteria::ASC) Order by the weight column
- * @method     ChildOrderProductQuery orderByTax($order = Criteria::ASC) Order by the tax column
+ * @method     ChildOrderProductQuery orderByTaxRuleTitle($order = Criteria::ASC) Order by the tax_rule_title column
+ * @method     ChildOrderProductQuery orderByTaxRuleDescription($order = Criteria::ASC) Order by the tax_rule_description column
  * @method     ChildOrderProductQuery orderByParent($order = Criteria::ASC) Order by the parent column
  * @method     ChildOrderProductQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
  * @method     ChildOrderProductQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
@@ -54,7 +55,8 @@ use Thelia\Model\Map\OrderProductTableMap;
  * @method     ChildOrderProductQuery groupByWasNew() Group by the was_new column
  * @method     ChildOrderProductQuery groupByWasInPromo() Group by the was_in_promo column
  * @method     ChildOrderProductQuery groupByWeight() Group by the weight column
- * @method     ChildOrderProductQuery groupByTax() Group by the tax column
+ * @method     ChildOrderProductQuery groupByTaxRuleTitle() Group by the tax_rule_title column
+ * @method     ChildOrderProductQuery groupByTaxRuleDescription() Group by the tax_rule_description column
  * @method     ChildOrderProductQuery groupByParent() Group by the parent column
  * @method     ChildOrderProductQuery groupByCreatedAt() Group by the created_at column
  * @method     ChildOrderProductQuery groupByUpdatedAt() Group by the updated_at column
@@ -67,9 +69,13 @@ use Thelia\Model\Map\OrderProductTableMap;
  * @method     ChildOrderProductQuery rightJoinOrder($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Order relation
  * @method     ChildOrderProductQuery innerJoinOrder($relationAlias = null) Adds a INNER JOIN clause to the query using the Order relation
  *
- * @method     ChildOrderProductQuery leftJoinOrderAttributeCombination($relationAlias = null) Adds a LEFT JOIN clause to the query using the OrderAttributeCombination relation
- * @method     ChildOrderProductQuery rightJoinOrderAttributeCombination($relationAlias = null) Adds a RIGHT JOIN clause to the query using the OrderAttributeCombination relation
- * @method     ChildOrderProductQuery innerJoinOrderAttributeCombination($relationAlias = null) Adds a INNER JOIN clause to the query using the OrderAttributeCombination relation
+ * @method     ChildOrderProductQuery leftJoinOrderProductAttributeCombination($relationAlias = null) Adds a LEFT JOIN clause to the query using the OrderProductAttributeCombination relation
+ * @method     ChildOrderProductQuery rightJoinOrderProductAttributeCombination($relationAlias = null) Adds a RIGHT JOIN clause to the query using the OrderProductAttributeCombination relation
+ * @method     ChildOrderProductQuery innerJoinOrderProductAttributeCombination($relationAlias = null) Adds a INNER JOIN clause to the query using the OrderProductAttributeCombination relation
+ *
+ * @method     ChildOrderProductQuery leftJoinOrderProductTax($relationAlias = null) Adds a LEFT JOIN clause to the query using the OrderProductTax relation
+ * @method     ChildOrderProductQuery rightJoinOrderProductTax($relationAlias = null) Adds a RIGHT JOIN clause to the query using the OrderProductTax relation
+ * @method     ChildOrderProductQuery innerJoinOrderProductTax($relationAlias = null) Adds a INNER JOIN clause to the query using the OrderProductTax relation
  *
  * @method     ChildOrderProduct findOne(ConnectionInterface $con = null) Return the first ChildOrderProduct matching the query
  * @method     ChildOrderProduct findOneOrCreate(ConnectionInterface $con = null) Return the first ChildOrderProduct matching the query, or a new ChildOrderProduct object populated from the query conditions when no match is found
@@ -88,7 +94,8 @@ use Thelia\Model\Map\OrderProductTableMap;
  * @method     ChildOrderProduct findOneByWasNew(int $was_new) Return the first ChildOrderProduct filtered by the was_new column
  * @method     ChildOrderProduct findOneByWasInPromo(int $was_in_promo) Return the first ChildOrderProduct filtered by the was_in_promo column
  * @method     ChildOrderProduct findOneByWeight(string $weight) Return the first ChildOrderProduct filtered by the weight column
- * @method     ChildOrderProduct findOneByTax(double $tax) Return the first ChildOrderProduct filtered by the tax column
+ * @method     ChildOrderProduct findOneByTaxRuleTitle(string $tax_rule_title) Return the first ChildOrderProduct filtered by the tax_rule_title column
+ * @method     ChildOrderProduct findOneByTaxRuleDescription(string $tax_rule_description) Return the first ChildOrderProduct filtered by the tax_rule_description column
  * @method     ChildOrderProduct findOneByParent(int $parent) Return the first ChildOrderProduct filtered by the parent column
  * @method     ChildOrderProduct findOneByCreatedAt(string $created_at) Return the first ChildOrderProduct filtered by the created_at column
  * @method     ChildOrderProduct findOneByUpdatedAt(string $updated_at) Return the first ChildOrderProduct filtered by the updated_at column
@@ -107,7 +114,8 @@ use Thelia\Model\Map\OrderProductTableMap;
  * @method     array findByWasNew(int $was_new) Return ChildOrderProduct objects filtered by the was_new column
  * @method     array findByWasInPromo(int $was_in_promo) Return ChildOrderProduct objects filtered by the was_in_promo column
  * @method     array findByWeight(string $weight) Return ChildOrderProduct objects filtered by the weight column
- * @method     array findByTax(double $tax) Return ChildOrderProduct objects filtered by the tax column
+ * @method     array findByTaxRuleTitle(string $tax_rule_title) Return ChildOrderProduct objects filtered by the tax_rule_title column
+ * @method     array findByTaxRuleDescription(string $tax_rule_description) Return ChildOrderProduct objects filtered by the tax_rule_description column
  * @method     array findByParent(int $parent) Return ChildOrderProduct objects filtered by the parent column
  * @method     array findByCreatedAt(string $created_at) Return ChildOrderProduct objects filtered by the created_at column
  * @method     array findByUpdatedAt(string $updated_at) Return ChildOrderProduct objects filtered by the updated_at column
@@ -199,7 +207,7 @@ abstract class OrderProductQuery extends ModelCriteria
      */
     protected function findPkSimple($key, $con)
     {
-        $sql = 'SELECT ID, ORDER_ID, PRODUCT_REF, PRODUCT_SALE_ELEMENTS_REF, TITLE, CHAPO, DESCRIPTION, POSTSCRIPTUM, QUANTITY, PRICE, PROMO_PRICE, WAS_NEW, WAS_IN_PROMO, WEIGHT, TAX, PARENT, CREATED_AT, UPDATED_AT FROM order_product WHERE ID = :p0';
+        $sql = 'SELECT ID, ORDER_ID, PRODUCT_REF, PRODUCT_SALE_ELEMENTS_REF, TITLE, CHAPO, DESCRIPTION, POSTSCRIPTUM, QUANTITY, PRICE, PROMO_PRICE, WAS_NEW, WAS_IN_PROMO, WEIGHT, TAX_RULE_TITLE, TAX_RULE_DESCRIPTION, PARENT, CREATED_AT, UPDATED_AT FROM order_product WHERE ID = :p0';
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -769,44 +777,61 @@ abstract class OrderProductQuery extends ModelCriteria
     }
 
     /**
-     * Filter the query on the tax column
+     * Filter the query on the tax_rule_title column
      *
      * Example usage:
      * <code>
-     * $query->filterByTax(1234); // WHERE tax = 1234
-     * $query->filterByTax(array(12, 34)); // WHERE tax IN (12, 34)
-     * $query->filterByTax(array('min' => 12)); // WHERE tax > 12
+     * $query->filterByTaxRuleTitle('fooValue');   // WHERE tax_rule_title = 'fooValue'
+     * $query->filterByTaxRuleTitle('%fooValue%'); // WHERE tax_rule_title LIKE '%fooValue%'
      * </code>
      *
-     * @param     mixed $tax The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $taxRuleTitle The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
      * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildOrderProductQuery The current query, for fluid interface
      */
-    public function filterByTax($tax = null, $comparison = null)
+    public function filterByTaxRuleTitle($taxRuleTitle = null, $comparison = null)
     {
-        if (is_array($tax)) {
-            $useMinMax = false;
-            if (isset($tax['min'])) {
-                $this->addUsingAlias(OrderProductTableMap::TAX, $tax['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($tax['max'])) {
-                $this->addUsingAlias(OrderProductTableMap::TAX, $tax['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
+        if (null === $comparison) {
+            if (is_array($taxRuleTitle)) {
                 $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $taxRuleTitle)) {
+                $taxRuleTitle = str_replace('*', '%', $taxRuleTitle);
+                $comparison = Criteria::LIKE;
             }
         }
 
-        return $this->addUsingAlias(OrderProductTableMap::TAX, $tax, $comparison);
+        return $this->addUsingAlias(OrderProductTableMap::TAX_RULE_TITLE, $taxRuleTitle, $comparison);
+    }
+
+    /**
+     * Filter the query on the tax_rule_description column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByTaxRuleDescription('fooValue');   // WHERE tax_rule_description = 'fooValue'
+     * $query->filterByTaxRuleDescription('%fooValue%'); // WHERE tax_rule_description LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $taxRuleDescription The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByTaxRuleDescription($taxRuleDescription = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($taxRuleDescription)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $taxRuleDescription)) {
+                $taxRuleDescription = str_replace('*', '%', $taxRuleDescription);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::TAX_RULE_DESCRIPTION, $taxRuleDescription, $comparison);
     }
 
     /**
@@ -1012,40 +1037,40 @@ abstract class OrderProductQuery extends ModelCriteria
     }
 
     /**
-     * Filter the query by a related \Thelia\Model\OrderAttributeCombination object
+     * Filter the query by a related \Thelia\Model\OrderProductAttributeCombination object
      *
-     * @param \Thelia\Model\OrderAttributeCombination|ObjectCollection $orderAttributeCombination  the related object to use as filter
+     * @param \Thelia\Model\OrderProductAttributeCombination|ObjectCollection $orderProductAttributeCombination  the related object to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildOrderProductQuery The current query, for fluid interface
      */
-    public function filterByOrderAttributeCombination($orderAttributeCombination, $comparison = null)
+    public function filterByOrderProductAttributeCombination($orderProductAttributeCombination, $comparison = null)
     {
-        if ($orderAttributeCombination instanceof \Thelia\Model\OrderAttributeCombination) {
+        if ($orderProductAttributeCombination instanceof \Thelia\Model\OrderProductAttributeCombination) {
             return $this
-                ->addUsingAlias(OrderProductTableMap::ID, $orderAttributeCombination->getOrderProductId(), $comparison);
-        } elseif ($orderAttributeCombination instanceof ObjectCollection) {
+                ->addUsingAlias(OrderProductTableMap::ID, $orderProductAttributeCombination->getOrderProductId(), $comparison);
+        } elseif ($orderProductAttributeCombination instanceof ObjectCollection) {
             return $this
-                ->useOrderAttributeCombinationQuery()
-                ->filterByPrimaryKeys($orderAttributeCombination->getPrimaryKeys())
+                ->useOrderProductAttributeCombinationQuery()
+                ->filterByPrimaryKeys($orderProductAttributeCombination->getPrimaryKeys())
                 ->endUse();
         } else {
-            throw new PropelException('filterByOrderAttributeCombination() only accepts arguments of type \Thelia\Model\OrderAttributeCombination or Collection');
+            throw new PropelException('filterByOrderProductAttributeCombination() only accepts arguments of type \Thelia\Model\OrderProductAttributeCombination or Collection');
         }
     }
 
     /**
-     * Adds a JOIN clause to the query using the OrderAttributeCombination relation
+     * Adds a JOIN clause to the query using the OrderProductAttributeCombination relation
      *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildOrderProductQuery The current query, for fluid interface
      */
-    public function joinOrderAttributeCombination($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function joinOrderProductAttributeCombination($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
         $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('OrderAttributeCombination');
+        $relationMap = $tableMap->getRelation('OrderProductAttributeCombination');
 
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -1060,14 +1085,14 @@ abstract class OrderProductQuery extends ModelCriteria
             $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
             $this->addJoinObject($join, $relationAlias);
         } else {
-            $this->addJoinObject($join, 'OrderAttributeCombination');
+            $this->addJoinObject($join, 'OrderProductAttributeCombination');
         }
 
         return $this;
     }
 
     /**
-     * Use the OrderAttributeCombination relation OrderAttributeCombination object
+     * Use the OrderProductAttributeCombination relation OrderProductAttributeCombination object
      *
      * @see useQuery()
      *
@@ -1075,13 +1100,86 @@ abstract class OrderProductQuery extends ModelCriteria
      *                                   to be used as main alias in the secondary query
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return   \Thelia\Model\OrderAttributeCombinationQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\OrderProductAttributeCombinationQuery A secondary query class using the current class as primary query
      */
-    public function useOrderAttributeCombinationQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function useOrderProductAttributeCombinationQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
         return $this
-            ->joinOrderAttributeCombination($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'OrderAttributeCombination', '\Thelia\Model\OrderAttributeCombinationQuery');
+            ->joinOrderProductAttributeCombination($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'OrderProductAttributeCombination', '\Thelia\Model\OrderProductAttributeCombinationQuery');
+    }
+
+    /**
+     * Filter the query by a related \Thelia\Model\OrderProductTax object
+     *
+     * @param \Thelia\Model\OrderProductTax|ObjectCollection $orderProductTax  the related object to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByOrderProductTax($orderProductTax, $comparison = null)
+    {
+        if ($orderProductTax instanceof \Thelia\Model\OrderProductTax) {
+            return $this
+                ->addUsingAlias(OrderProductTableMap::ID, $orderProductTax->getOrderProductId(), $comparison);
+        } elseif ($orderProductTax instanceof ObjectCollection) {
+            return $this
+                ->useOrderProductTaxQuery()
+                ->filterByPrimaryKeys($orderProductTax->getPrimaryKeys())
+                ->endUse();
+        } else {
+            throw new PropelException('filterByOrderProductTax() only accepts arguments of type \Thelia\Model\OrderProductTax or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the OrderProductTax relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function joinOrderProductTax($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('OrderProductTax');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'OrderProductTax');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the OrderProductTax relation OrderProductTax object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return   \Thelia\Model\OrderProductTaxQuery A secondary query class using the current class as primary query
+     */
+    public function useOrderProductTaxQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        return $this
+            ->joinOrderProductTax($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'OrderProductTax', '\Thelia\Model\OrderProductTaxQuery');
     }
 
     /**
diff --git a/core/lib/Thelia/Model/Map/OrderAttributeCombinationTableMap.php b/core/lib/Thelia/Model/Map/OrderAttributeCombinationTableMap.php
deleted file mode 100644
index f87e8d59e..000000000
--- a/core/lib/Thelia/Model/Map/OrderAttributeCombinationTableMap.php
+++ /dev/null
@@ -1,503 +0,0 @@
-<?php
-
-namespace Thelia\Model\Map;
-
-use Propel\Runtime\Propel;
-use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\InstancePoolTrait;
-use Propel\Runtime\Connection\ConnectionInterface;
-use Propel\Runtime\Exception\PropelException;
-use Propel\Runtime\Map\RelationMap;
-use Propel\Runtime\Map\TableMap;
-use Propel\Runtime\Map\TableMapTrait;
-use Thelia\Model\OrderAttributeCombination;
-use Thelia\Model\OrderAttributeCombinationQuery;
-
-
-/**
- * This class defines the structure of the 'order_attribute_combination' table.
- *
- *
- *
- * This map class is used by Propel to do runtime db structure discovery.
- * For example, the createSelectSql() method checks the type of a given column used in an
- * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
- * (i.e. if it's a text column type).
- *
- */
-class OrderAttributeCombinationTableMap extends TableMap
-{
-    use InstancePoolTrait;
-    use TableMapTrait;
-    /**
-     * The (dot-path) name of this class
-     */
-    const CLASS_NAME = 'Thelia.Model.Map.OrderAttributeCombinationTableMap';
-
-    /**
-     * The default database name for this class
-     */
-    const DATABASE_NAME = 'thelia';
-
-    /**
-     * The table name for this class
-     */
-    const TABLE_NAME = 'order_attribute_combination';
-
-    /**
-     * The related Propel class for this table
-     */
-    const OM_CLASS = '\\Thelia\\Model\\OrderAttributeCombination';
-
-    /**
-     * A class that can be returned by this tableMap
-     */
-    const CLASS_DEFAULT = 'Thelia.Model.OrderAttributeCombination';
-
-    /**
-     * The total number of columns
-     */
-    const NUM_COLUMNS = 12;
-
-    /**
-     * The number of lazy-loaded columns
-     */
-    const NUM_LAZY_LOAD_COLUMNS = 0;
-
-    /**
-     * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
-     */
-    const NUM_HYDRATE_COLUMNS = 12;
-
-    /**
-     * the column name for the ID field
-     */
-    const ID = 'order_attribute_combination.ID';
-
-    /**
-     * the column name for the ORDER_PRODUCT_ID field
-     */
-    const ORDER_PRODUCT_ID = 'order_attribute_combination.ORDER_PRODUCT_ID';
-
-    /**
-     * the column name for the ATTRIBUTE_TITLE field
-     */
-    const ATTRIBUTE_TITLE = 'order_attribute_combination.ATTRIBUTE_TITLE';
-
-    /**
-     * the column name for the ATTRIBUTE_CHAPO field
-     */
-    const ATTRIBUTE_CHAPO = 'order_attribute_combination.ATTRIBUTE_CHAPO';
-
-    /**
-     * the column name for the ATTRIBUTE_DESCRIPTION field
-     */
-    const ATTRIBUTE_DESCRIPTION = 'order_attribute_combination.ATTRIBUTE_DESCRIPTION';
-
-    /**
-     * the column name for the ATTRIBUTE_POSTSCRIPTUMN field
-     */
-    const ATTRIBUTE_POSTSCRIPTUMN = 'order_attribute_combination.ATTRIBUTE_POSTSCRIPTUMN';
-
-    /**
-     * the column name for the ATTRIBUTE_AV_TITLE field
-     */
-    const ATTRIBUTE_AV_TITLE = 'order_attribute_combination.ATTRIBUTE_AV_TITLE';
-
-    /**
-     * the column name for the ATTRIBUTE_AV_CHAPO field
-     */
-    const ATTRIBUTE_AV_CHAPO = 'order_attribute_combination.ATTRIBUTE_AV_CHAPO';
-
-    /**
-     * the column name for the ATTRIBUTE_AV_DESCRIPTION field
-     */
-    const ATTRIBUTE_AV_DESCRIPTION = 'order_attribute_combination.ATTRIBUTE_AV_DESCRIPTION';
-
-    /**
-     * the column name for the ATTRIBUTE_AV_POSTSCRIPTUM field
-     */
-    const ATTRIBUTE_AV_POSTSCRIPTUM = 'order_attribute_combination.ATTRIBUTE_AV_POSTSCRIPTUM';
-
-    /**
-     * the column name for the CREATED_AT field
-     */
-    const CREATED_AT = 'order_attribute_combination.CREATED_AT';
-
-    /**
-     * the column name for the UPDATED_AT field
-     */
-    const UPDATED_AT = 'order_attribute_combination.UPDATED_AT';
-
-    /**
-     * The default string format for model objects of the related table
-     */
-    const DEFAULT_STRING_FORMAT = 'YAML';
-
-    /**
-     * holds an array of fieldnames
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
-     */
-    protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'OrderProductId', 'AttributeTitle', 'AttributeChapo', 'AttributeDescription', 'AttributePostscriptumn', 'AttributeAvTitle', 'AttributeAvChapo', 'AttributeAvDescription', 'AttributeAvPostscriptum', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'orderProductId', 'attributeTitle', 'attributeChapo', 'attributeDescription', 'attributePostscriptumn', 'attributeAvTitle', 'attributeAvChapo', 'attributeAvDescription', 'attributeAvPostscriptum', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(OrderAttributeCombinationTableMap::ID, OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE, OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO, OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION, OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM, OrderAttributeCombinationTableMap::CREATED_AT, OrderAttributeCombinationTableMap::UPDATED_AT, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'ORDER_PRODUCT_ID', 'ATTRIBUTE_TITLE', 'ATTRIBUTE_CHAPO', 'ATTRIBUTE_DESCRIPTION', 'ATTRIBUTE_POSTSCRIPTUMN', 'ATTRIBUTE_AV_TITLE', 'ATTRIBUTE_AV_CHAPO', 'ATTRIBUTE_AV_DESCRIPTION', 'ATTRIBUTE_AV_POSTSCRIPTUM', 'CREATED_AT', 'UPDATED_AT', ),
-        self::TYPE_FIELDNAME     => array('id', 'order_product_id', 'attribute_title', 'attribute_chapo', 'attribute_description', 'attribute_postscriptumn', 'attribute_av_title', 'attribute_av_chapo', 'attribute_av_description', 'attribute_av_postscriptum', 'created_at', 'updated_at', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, )
-    );
-
-    /**
-     * holds an array of keys for quick access to the fieldnames array
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
-     */
-    protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'OrderProductId' => 1, 'AttributeTitle' => 2, 'AttributeChapo' => 3, 'AttributeDescription' => 4, 'AttributePostscriptumn' => 5, 'AttributeAvTitle' => 6, 'AttributeAvChapo' => 7, 'AttributeAvDescription' => 8, 'AttributeAvPostscriptum' => 9, 'CreatedAt' => 10, 'UpdatedAt' => 11, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'orderProductId' => 1, 'attributeTitle' => 2, 'attributeChapo' => 3, 'attributeDescription' => 4, 'attributePostscriptumn' => 5, 'attributeAvTitle' => 6, 'attributeAvChapo' => 7, 'attributeAvDescription' => 8, 'attributeAvPostscriptum' => 9, 'createdAt' => 10, 'updatedAt' => 11, ),
-        self::TYPE_COLNAME       => array(OrderAttributeCombinationTableMap::ID => 0, OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID => 1, OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE => 2, OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO => 3, OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION => 4, OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN => 5, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE => 6, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO => 7, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION => 8, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM => 9, OrderAttributeCombinationTableMap::CREATED_AT => 10, OrderAttributeCombinationTableMap::UPDATED_AT => 11, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'ORDER_PRODUCT_ID' => 1, 'ATTRIBUTE_TITLE' => 2, 'ATTRIBUTE_CHAPO' => 3, 'ATTRIBUTE_DESCRIPTION' => 4, 'ATTRIBUTE_POSTSCRIPTUMN' => 5, 'ATTRIBUTE_AV_TITLE' => 6, 'ATTRIBUTE_AV_CHAPO' => 7, 'ATTRIBUTE_AV_DESCRIPTION' => 8, 'ATTRIBUTE_AV_POSTSCRIPTUM' => 9, 'CREATED_AT' => 10, 'UPDATED_AT' => 11, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'order_product_id' => 1, 'attribute_title' => 2, 'attribute_chapo' => 3, 'attribute_description' => 4, 'attribute_postscriptumn' => 5, 'attribute_av_title' => 6, 'attribute_av_chapo' => 7, 'attribute_av_description' => 8, 'attribute_av_postscriptum' => 9, 'created_at' => 10, 'updated_at' => 11, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, )
-    );
-
-    /**
-     * Initialize the table attributes and columns
-     * Relations are not initialized by this method since they are lazy loaded
-     *
-     * @return void
-     * @throws PropelException
-     */
-    public function initialize()
-    {
-        // attributes
-        $this->setName('order_attribute_combination');
-        $this->setPhpName('OrderAttributeCombination');
-        $this->setClassName('\\Thelia\\Model\\OrderAttributeCombination');
-        $this->setPackage('Thelia.Model');
-        $this->setUseIdGenerator(true);
-        // columns
-        $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
-        $this->addForeignKey('ORDER_PRODUCT_ID', 'OrderProductId', 'INTEGER', 'order_product', 'ID', true, null, null);
-        $this->addColumn('ATTRIBUTE_TITLE', 'AttributeTitle', 'VARCHAR', true, 255, null);
-        $this->addColumn('ATTRIBUTE_CHAPO', 'AttributeChapo', 'LONGVARCHAR', false, null, null);
-        $this->addColumn('ATTRIBUTE_DESCRIPTION', 'AttributeDescription', 'CLOB', false, null, null);
-        $this->addColumn('ATTRIBUTE_POSTSCRIPTUMN', 'AttributePostscriptumn', 'LONGVARCHAR', false, null, null);
-        $this->addColumn('ATTRIBUTE_AV_TITLE', 'AttributeAvTitle', 'VARCHAR', true, 255, null);
-        $this->addColumn('ATTRIBUTE_AV_CHAPO', 'AttributeAvChapo', 'LONGVARCHAR', false, null, null);
-        $this->addColumn('ATTRIBUTE_AV_DESCRIPTION', 'AttributeAvDescription', 'CLOB', false, null, null);
-        $this->addColumn('ATTRIBUTE_AV_POSTSCRIPTUM', 'AttributeAvPostscriptum', 'LONGVARCHAR', false, null, null);
-        $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
-        $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
-    } // initialize()
-
-    /**
-     * Build the RelationMap objects for this table relationships
-     */
-    public function buildRelations()
-    {
-        $this->addRelation('OrderProduct', '\\Thelia\\Model\\OrderProduct', RelationMap::MANY_TO_ONE, array('order_product_id' => 'id', ), 'CASCADE', 'RESTRICT');
-    } // buildRelations()
-
-    /**
-     *
-     * Gets the list of behaviors registered for this table
-     *
-     * @return array Associative array (name => parameters) of behaviors
-     */
-    public function getBehaviors()
-    {
-        return array(
-            'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
-        );
-    } // getBehaviors()
-
-    /**
-     * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
-     *
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, a serialize()d version of the primary key will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     */
-    public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        // If the PK cannot be derived from the row, return NULL.
-        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
-            return null;
-        }
-
-        return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
-    }
-
-    /**
-     * Retrieves the primary key from the DB resultset row
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, an array of the primary key columns will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     *
-     * @return mixed The primary key of the row
-     */
-    public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-
-            return (int) $row[
-                            $indexType == TableMap::TYPE_NUM
-                            ? 0 + $offset
-                            : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
-                        ];
-    }
-
-    /**
-     * The class that the tableMap will make instances of.
-     *
-     * If $withPrefix is true, the returned path
-     * uses a dot-path notation which is translated into a path
-     * relative to a location on the PHP include_path.
-     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
-     *
-     * @param boolean $withPrefix Whether or not to return the path with the class name
-     * @return string path.to.ClassName
-     */
-    public static function getOMClass($withPrefix = true)
-    {
-        return $withPrefix ? OrderAttributeCombinationTableMap::CLASS_DEFAULT : OrderAttributeCombinationTableMap::OM_CLASS;
-    }
-
-    /**
-     * Populates an object of the default type or an object that inherit from the default.
-     *
-     * @param array  $row       row returned by DataFetcher->fetch().
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
-                                 One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     * @return array (OrderAttributeCombination object, last column rank)
-     */
-    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        $key = OrderAttributeCombinationTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
-        if (null !== ($obj = OrderAttributeCombinationTableMap::getInstanceFromPool($key))) {
-            // We no longer rehydrate the object, since this can cause data loss.
-            // See http://www.propelorm.org/ticket/509
-            // $obj->hydrate($row, $offset, true); // rehydrate
-            $col = $offset + OrderAttributeCombinationTableMap::NUM_HYDRATE_COLUMNS;
-        } else {
-            $cls = OrderAttributeCombinationTableMap::OM_CLASS;
-            $obj = new $cls();
-            $col = $obj->hydrate($row, $offset, false, $indexType);
-            OrderAttributeCombinationTableMap::addInstanceToPool($obj, $key);
-        }
-
-        return array($obj, $col);
-    }
-
-    /**
-     * The returned array will contain objects of the default type or
-     * objects that inherit from the default.
-     *
-     * @param DataFetcherInterface $dataFetcher
-     * @return array
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function populateObjects(DataFetcherInterface $dataFetcher)
-    {
-        $results = array();
-
-        // set the class once to avoid overhead in the loop
-        $cls = static::getOMClass(false);
-        // populate the object(s)
-        while ($row = $dataFetcher->fetch()) {
-            $key = OrderAttributeCombinationTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
-            if (null !== ($obj = OrderAttributeCombinationTableMap::getInstanceFromPool($key))) {
-                // We no longer rehydrate the object, since this can cause data loss.
-                // See http://www.propelorm.org/ticket/509
-                // $obj->hydrate($row, 0, true); // rehydrate
-                $results[] = $obj;
-            } else {
-                $obj = new $cls();
-                $obj->hydrate($row);
-                $results[] = $obj;
-                OrderAttributeCombinationTableMap::addInstanceToPool($obj, $key);
-            } // if key exists
-        }
-
-        return $results;
-    }
-    /**
-     * Add all the columns needed to create a new object.
-     *
-     * Note: any columns that were marked with lazyLoad="true" in the
-     * XML schema will not be added to the select list and only loaded
-     * on demand.
-     *
-     * @param Criteria $criteria object containing the columns to add.
-     * @param string   $alias    optional table alias
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function addSelectColumns(Criteria $criteria, $alias = null)
-    {
-        if (null === $alias) {
-            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ID);
-            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID);
-            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE);
-            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO);
-            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION);
-            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN);
-            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE);
-            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO);
-            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION);
-            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM);
-            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::CREATED_AT);
-            $criteria->addSelectColumn(OrderAttributeCombinationTableMap::UPDATED_AT);
-        } else {
-            $criteria->addSelectColumn($alias . '.ID');
-            $criteria->addSelectColumn($alias . '.ORDER_PRODUCT_ID');
-            $criteria->addSelectColumn($alias . '.ATTRIBUTE_TITLE');
-            $criteria->addSelectColumn($alias . '.ATTRIBUTE_CHAPO');
-            $criteria->addSelectColumn($alias . '.ATTRIBUTE_DESCRIPTION');
-            $criteria->addSelectColumn($alias . '.ATTRIBUTE_POSTSCRIPTUMN');
-            $criteria->addSelectColumn($alias . '.ATTRIBUTE_AV_TITLE');
-            $criteria->addSelectColumn($alias . '.ATTRIBUTE_AV_CHAPO');
-            $criteria->addSelectColumn($alias . '.ATTRIBUTE_AV_DESCRIPTION');
-            $criteria->addSelectColumn($alias . '.ATTRIBUTE_AV_POSTSCRIPTUM');
-            $criteria->addSelectColumn($alias . '.CREATED_AT');
-            $criteria->addSelectColumn($alias . '.UPDATED_AT');
-        }
-    }
-
-    /**
-     * Returns the TableMap related to this object.
-     * This method is not needed for general use but a specific application could have a need.
-     * @return TableMap
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function getTableMap()
-    {
-        return Propel::getServiceContainer()->getDatabaseMap(OrderAttributeCombinationTableMap::DATABASE_NAME)->getTable(OrderAttributeCombinationTableMap::TABLE_NAME);
-    }
-
-    /**
-     * Add a TableMap instance to the database for this tableMap class.
-     */
-    public static function buildTableMap()
-    {
-      $dbMap = Propel::getServiceContainer()->getDatabaseMap(OrderAttributeCombinationTableMap::DATABASE_NAME);
-      if (!$dbMap->hasTable(OrderAttributeCombinationTableMap::TABLE_NAME)) {
-        $dbMap->addTableObject(new OrderAttributeCombinationTableMap());
-      }
-    }
-
-    /**
-     * Performs a DELETE on the database, given a OrderAttributeCombination or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or OrderAttributeCombination object or primary key or array of primary keys
-     *              which is used to create the DELETE statement
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-     public static function doDelete($values, ConnectionInterface $con = null)
-     {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(OrderAttributeCombinationTableMap::DATABASE_NAME);
-        }
-
-        if ($values instanceof Criteria) {
-            // rename for clarity
-            $criteria = $values;
-        } elseif ($values instanceof \Thelia\Model\OrderAttributeCombination) { // it's a model object
-            // create criteria based on pk values
-            $criteria = $values->buildPkeyCriteria();
-        } else { // it's a primary key, or an array of pks
-            $criteria = new Criteria(OrderAttributeCombinationTableMap::DATABASE_NAME);
-            $criteria->add(OrderAttributeCombinationTableMap::ID, (array) $values, Criteria::IN);
-        }
-
-        $query = OrderAttributeCombinationQuery::create()->mergeWith($criteria);
-
-        if ($values instanceof Criteria) { OrderAttributeCombinationTableMap::clearInstancePool();
-        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
-            foreach ((array) $values as $singleval) { OrderAttributeCombinationTableMap::removeInstanceFromPool($singleval);
-            }
-        }
-
-        return $query->delete($con);
-    }
-
-    /**
-     * Deletes all rows from the order_attribute_combination table.
-     *
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).
-     */
-    public static function doDeleteAll(ConnectionInterface $con = null)
-    {
-        return OrderAttributeCombinationQuery::create()->doDeleteAll($con);
-    }
-
-    /**
-     * Performs an INSERT on the database, given a OrderAttributeCombination or Criteria object.
-     *
-     * @param mixed               $criteria Criteria or OrderAttributeCombination object containing data that is used to create the INSERT statement.
-     * @param ConnectionInterface $con the ConnectionInterface connection to use
-     * @return mixed           The new primary key.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function doInsert($criteria, ConnectionInterface $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(OrderAttributeCombinationTableMap::DATABASE_NAME);
-        }
-
-        if ($criteria instanceof Criteria) {
-            $criteria = clone $criteria; // rename for clarity
-        } else {
-            $criteria = $criteria->buildCriteria(); // build Criteria from OrderAttributeCombination object
-        }
-
-        if ($criteria->containsKey(OrderAttributeCombinationTableMap::ID) && $criteria->keyContainsValue(OrderAttributeCombinationTableMap::ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.OrderAttributeCombinationTableMap::ID.')');
-        }
-
-
-        // Set the correct dbName
-        $query = OrderAttributeCombinationQuery::create()->mergeWith($criteria);
-
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table (I guess, conceivably)
-            $con->beginTransaction();
-            $pk = $query->doInsert($con);
-            $con->commit();
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-
-        return $pk;
-    }
-
-} // OrderAttributeCombinationTableMap
-// This is the static code needed to register the TableMap for this table with the main Propel class.
-//
-OrderAttributeCombinationTableMap::buildTableMap();
diff --git a/core/lib/Thelia/Model/Map/OrderProductTableMap.php b/core/lib/Thelia/Model/Map/OrderProductTableMap.php
index 3820ad081..8144f23a7 100644
--- a/core/lib/Thelia/Model/Map/OrderProductTableMap.php
+++ b/core/lib/Thelia/Model/Map/OrderProductTableMap.php
@@ -57,7 +57,7 @@ class OrderProductTableMap extends TableMap
     /**
      * The total number of columns
      */
-    const NUM_COLUMNS = 18;
+    const NUM_COLUMNS = 19;
 
     /**
      * The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class OrderProductTableMap extends TableMap
     /**
      * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
      */
-    const NUM_HYDRATE_COLUMNS = 18;
+    const NUM_HYDRATE_COLUMNS = 19;
 
     /**
      * the column name for the ID field
@@ -140,9 +140,14 @@ class OrderProductTableMap extends TableMap
     const WEIGHT = 'order_product.WEIGHT';
 
     /**
-     * the column name for the TAX field
+     * the column name for the TAX_RULE_TITLE field
      */
-    const TAX = 'order_product.TAX';
+    const TAX_RULE_TITLE = 'order_product.TAX_RULE_TITLE';
+
+    /**
+     * the column name for the TAX_RULE_DESCRIPTION field
+     */
+    const TAX_RULE_DESCRIPTION = 'order_product.TAX_RULE_DESCRIPTION';
 
     /**
      * the column name for the PARENT field
@@ -171,12 +176,12 @@ class OrderProductTableMap extends TableMap
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'OrderId', 'ProductRef', 'ProductSaleElementsRef', 'Title', 'Chapo', 'Description', 'Postscriptum', 'Quantity', 'Price', 'PromoPrice', 'WasNew', 'WasInPromo', 'Weight', 'Tax', 'Parent', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'orderId', 'productRef', 'productSaleElementsRef', 'title', 'chapo', 'description', 'postscriptum', 'quantity', 'price', 'promoPrice', 'wasNew', 'wasInPromo', 'weight', 'tax', 'parent', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(OrderProductTableMap::ID, OrderProductTableMap::ORDER_ID, OrderProductTableMap::PRODUCT_REF, OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF, OrderProductTableMap::TITLE, OrderProductTableMap::CHAPO, OrderProductTableMap::DESCRIPTION, OrderProductTableMap::POSTSCRIPTUM, OrderProductTableMap::QUANTITY, OrderProductTableMap::PRICE, OrderProductTableMap::PROMO_PRICE, OrderProductTableMap::WAS_NEW, OrderProductTableMap::WAS_IN_PROMO, OrderProductTableMap::WEIGHT, OrderProductTableMap::TAX, OrderProductTableMap::PARENT, OrderProductTableMap::CREATED_AT, OrderProductTableMap::UPDATED_AT, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'ORDER_ID', 'PRODUCT_REF', 'PRODUCT_SALE_ELEMENTS_REF', 'TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM', 'QUANTITY', 'PRICE', 'PROMO_PRICE', 'WAS_NEW', 'WAS_IN_PROMO', 'WEIGHT', 'TAX', 'PARENT', 'CREATED_AT', 'UPDATED_AT', ),
-        self::TYPE_FIELDNAME     => array('id', 'order_id', 'product_ref', 'product_sale_elements_ref', 'title', 'chapo', 'description', 'postscriptum', 'quantity', 'price', 'promo_price', 'was_new', 'was_in_promo', 'weight', 'tax', 'parent', 'created_at', 'updated_at', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
+        self::TYPE_PHPNAME       => array('Id', 'OrderId', 'ProductRef', 'ProductSaleElementsRef', 'Title', 'Chapo', 'Description', 'Postscriptum', 'Quantity', 'Price', 'PromoPrice', 'WasNew', 'WasInPromo', 'Weight', 'TaxRuleTitle', 'TaxRuleDescription', 'Parent', 'CreatedAt', 'UpdatedAt', ),
+        self::TYPE_STUDLYPHPNAME => array('id', 'orderId', 'productRef', 'productSaleElementsRef', 'title', 'chapo', 'description', 'postscriptum', 'quantity', 'price', 'promoPrice', 'wasNew', 'wasInPromo', 'weight', 'taxRuleTitle', 'taxRuleDescription', 'parent', 'createdAt', 'updatedAt', ),
+        self::TYPE_COLNAME       => array(OrderProductTableMap::ID, OrderProductTableMap::ORDER_ID, OrderProductTableMap::PRODUCT_REF, OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF, OrderProductTableMap::TITLE, OrderProductTableMap::CHAPO, OrderProductTableMap::DESCRIPTION, OrderProductTableMap::POSTSCRIPTUM, OrderProductTableMap::QUANTITY, OrderProductTableMap::PRICE, OrderProductTableMap::PROMO_PRICE, OrderProductTableMap::WAS_NEW, OrderProductTableMap::WAS_IN_PROMO, OrderProductTableMap::WEIGHT, OrderProductTableMap::TAX_RULE_TITLE, OrderProductTableMap::TAX_RULE_DESCRIPTION, OrderProductTableMap::PARENT, OrderProductTableMap::CREATED_AT, OrderProductTableMap::UPDATED_AT, ),
+        self::TYPE_RAW_COLNAME   => array('ID', 'ORDER_ID', 'PRODUCT_REF', 'PRODUCT_SALE_ELEMENTS_REF', 'TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM', 'QUANTITY', 'PRICE', 'PROMO_PRICE', 'WAS_NEW', 'WAS_IN_PROMO', 'WEIGHT', 'TAX_RULE_TITLE', 'TAX_RULE_DESCRIPTION', 'PARENT', 'CREATED_AT', 'UPDATED_AT', ),
+        self::TYPE_FIELDNAME     => array('id', 'order_id', 'product_ref', 'product_sale_elements_ref', 'title', 'chapo', 'description', 'postscriptum', 'quantity', 'price', 'promo_price', 'was_new', 'was_in_promo', 'weight', 'tax_rule_title', 'tax_rule_description', 'parent', 'created_at', 'updated_at', ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
     );
 
     /**
@@ -186,12 +191,12 @@ class OrderProductTableMap extends TableMap
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
     protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'OrderId' => 1, 'ProductRef' => 2, 'ProductSaleElementsRef' => 3, 'Title' => 4, 'Chapo' => 5, 'Description' => 6, 'Postscriptum' => 7, 'Quantity' => 8, 'Price' => 9, 'PromoPrice' => 10, 'WasNew' => 11, 'WasInPromo' => 12, 'Weight' => 13, 'Tax' => 14, 'Parent' => 15, 'CreatedAt' => 16, 'UpdatedAt' => 17, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'orderId' => 1, 'productRef' => 2, 'productSaleElementsRef' => 3, 'title' => 4, 'chapo' => 5, 'description' => 6, 'postscriptum' => 7, 'quantity' => 8, 'price' => 9, 'promoPrice' => 10, 'wasNew' => 11, 'wasInPromo' => 12, 'weight' => 13, 'tax' => 14, 'parent' => 15, 'createdAt' => 16, 'updatedAt' => 17, ),
-        self::TYPE_COLNAME       => array(OrderProductTableMap::ID => 0, OrderProductTableMap::ORDER_ID => 1, OrderProductTableMap::PRODUCT_REF => 2, OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF => 3, OrderProductTableMap::TITLE => 4, OrderProductTableMap::CHAPO => 5, OrderProductTableMap::DESCRIPTION => 6, OrderProductTableMap::POSTSCRIPTUM => 7, OrderProductTableMap::QUANTITY => 8, OrderProductTableMap::PRICE => 9, OrderProductTableMap::PROMO_PRICE => 10, OrderProductTableMap::WAS_NEW => 11, OrderProductTableMap::WAS_IN_PROMO => 12, OrderProductTableMap::WEIGHT => 13, OrderProductTableMap::TAX => 14, OrderProductTableMap::PARENT => 15, OrderProductTableMap::CREATED_AT => 16, OrderProductTableMap::UPDATED_AT => 17, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'ORDER_ID' => 1, 'PRODUCT_REF' => 2, 'PRODUCT_SALE_ELEMENTS_REF' => 3, 'TITLE' => 4, 'CHAPO' => 5, 'DESCRIPTION' => 6, 'POSTSCRIPTUM' => 7, 'QUANTITY' => 8, 'PRICE' => 9, 'PROMO_PRICE' => 10, 'WAS_NEW' => 11, 'WAS_IN_PROMO' => 12, 'WEIGHT' => 13, 'TAX' => 14, 'PARENT' => 15, 'CREATED_AT' => 16, 'UPDATED_AT' => 17, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'order_id' => 1, 'product_ref' => 2, 'product_sale_elements_ref' => 3, 'title' => 4, 'chapo' => 5, 'description' => 6, 'postscriptum' => 7, 'quantity' => 8, 'price' => 9, 'promo_price' => 10, 'was_new' => 11, 'was_in_promo' => 12, 'weight' => 13, 'tax' => 14, 'parent' => 15, 'created_at' => 16, 'updated_at' => 17, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
+        self::TYPE_PHPNAME       => array('Id' => 0, 'OrderId' => 1, 'ProductRef' => 2, 'ProductSaleElementsRef' => 3, 'Title' => 4, 'Chapo' => 5, 'Description' => 6, 'Postscriptum' => 7, 'Quantity' => 8, 'Price' => 9, 'PromoPrice' => 10, 'WasNew' => 11, 'WasInPromo' => 12, 'Weight' => 13, 'TaxRuleTitle' => 14, 'TaxRuleDescription' => 15, 'Parent' => 16, 'CreatedAt' => 17, 'UpdatedAt' => 18, ),
+        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'orderId' => 1, 'productRef' => 2, 'productSaleElementsRef' => 3, 'title' => 4, 'chapo' => 5, 'description' => 6, 'postscriptum' => 7, 'quantity' => 8, 'price' => 9, 'promoPrice' => 10, 'wasNew' => 11, 'wasInPromo' => 12, 'weight' => 13, 'taxRuleTitle' => 14, 'taxRuleDescription' => 15, 'parent' => 16, 'createdAt' => 17, 'updatedAt' => 18, ),
+        self::TYPE_COLNAME       => array(OrderProductTableMap::ID => 0, OrderProductTableMap::ORDER_ID => 1, OrderProductTableMap::PRODUCT_REF => 2, OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF => 3, OrderProductTableMap::TITLE => 4, OrderProductTableMap::CHAPO => 5, OrderProductTableMap::DESCRIPTION => 6, OrderProductTableMap::POSTSCRIPTUM => 7, OrderProductTableMap::QUANTITY => 8, OrderProductTableMap::PRICE => 9, OrderProductTableMap::PROMO_PRICE => 10, OrderProductTableMap::WAS_NEW => 11, OrderProductTableMap::WAS_IN_PROMO => 12, OrderProductTableMap::WEIGHT => 13, OrderProductTableMap::TAX_RULE_TITLE => 14, OrderProductTableMap::TAX_RULE_DESCRIPTION => 15, OrderProductTableMap::PARENT => 16, OrderProductTableMap::CREATED_AT => 17, OrderProductTableMap::UPDATED_AT => 18, ),
+        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'ORDER_ID' => 1, 'PRODUCT_REF' => 2, 'PRODUCT_SALE_ELEMENTS_REF' => 3, 'TITLE' => 4, 'CHAPO' => 5, 'DESCRIPTION' => 6, 'POSTSCRIPTUM' => 7, 'QUANTITY' => 8, 'PRICE' => 9, 'PROMO_PRICE' => 10, 'WAS_NEW' => 11, 'WAS_IN_PROMO' => 12, 'WEIGHT' => 13, 'TAX_RULE_TITLE' => 14, 'TAX_RULE_DESCRIPTION' => 15, 'PARENT' => 16, 'CREATED_AT' => 17, 'UPDATED_AT' => 18, ),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'order_id' => 1, 'product_ref' => 2, 'product_sale_elements_ref' => 3, 'title' => 4, 'chapo' => 5, 'description' => 6, 'postscriptum' => 7, 'quantity' => 8, 'price' => 9, 'promo_price' => 10, 'was_new' => 11, 'was_in_promo' => 12, 'weight' => 13, 'tax_rule_title' => 14, 'tax_rule_description' => 15, 'parent' => 16, 'created_at' => 17, 'updated_at' => 18, ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
     );
 
     /**
@@ -224,7 +229,8 @@ class OrderProductTableMap extends TableMap
         $this->addColumn('WAS_NEW', 'WasNew', 'TINYINT', true, null, null);
         $this->addColumn('WAS_IN_PROMO', 'WasInPromo', 'TINYINT', true, null, null);
         $this->addColumn('WEIGHT', 'Weight', 'VARCHAR', false, 45, null);
-        $this->addColumn('TAX', 'Tax', 'FLOAT', false, null, null);
+        $this->addColumn('TAX_RULE_TITLE', 'TaxRuleTitle', 'VARCHAR', false, 255, null);
+        $this->addColumn('TAX_RULE_DESCRIPTION', 'TaxRuleDescription', 'CLOB', false, null, null);
         $this->addColumn('PARENT', 'Parent', 'INTEGER', false, null, null);
         $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
         $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
@@ -236,7 +242,8 @@ class OrderProductTableMap extends TableMap
     public function buildRelations()
     {
         $this->addRelation('Order', '\\Thelia\\Model\\Order', RelationMap::MANY_TO_ONE, array('order_id' => 'id', ), 'CASCADE', 'RESTRICT');
-        $this->addRelation('OrderAttributeCombination', '\\Thelia\\Model\\OrderAttributeCombination', RelationMap::ONE_TO_MANY, array('id' => 'order_product_id', ), 'CASCADE', 'RESTRICT', 'OrderAttributeCombinations');
+        $this->addRelation('OrderProductAttributeCombination', '\\Thelia\\Model\\OrderProductAttributeCombination', RelationMap::ONE_TO_MANY, array('id' => 'order_product_id', ), 'CASCADE', 'RESTRICT', 'OrderProductAttributeCombinations');
+        $this->addRelation('OrderProductTax', '\\Thelia\\Model\\OrderProductTax', RelationMap::ONE_TO_MANY, array('id' => 'order_product_id', ), 'CASCADE', 'RESTRICT', 'OrderProductTaxes');
     } // buildRelations()
 
     /**
@@ -258,7 +265,8 @@ class OrderProductTableMap extends TableMap
     {
         // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool,
         // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule.
-                OrderAttributeCombinationTableMap::clearInstancePool();
+                OrderProductAttributeCombinationTableMap::clearInstancePool();
+                OrderProductTaxTableMap::clearInstancePool();
             }
 
     /**
@@ -413,7 +421,8 @@ class OrderProductTableMap extends TableMap
             $criteria->addSelectColumn(OrderProductTableMap::WAS_NEW);
             $criteria->addSelectColumn(OrderProductTableMap::WAS_IN_PROMO);
             $criteria->addSelectColumn(OrderProductTableMap::WEIGHT);
-            $criteria->addSelectColumn(OrderProductTableMap::TAX);
+            $criteria->addSelectColumn(OrderProductTableMap::TAX_RULE_TITLE);
+            $criteria->addSelectColumn(OrderProductTableMap::TAX_RULE_DESCRIPTION);
             $criteria->addSelectColumn(OrderProductTableMap::PARENT);
             $criteria->addSelectColumn(OrderProductTableMap::CREATED_AT);
             $criteria->addSelectColumn(OrderProductTableMap::UPDATED_AT);
@@ -432,7 +441,8 @@ class OrderProductTableMap extends TableMap
             $criteria->addSelectColumn($alias . '.WAS_NEW');
             $criteria->addSelectColumn($alias . '.WAS_IN_PROMO');
             $criteria->addSelectColumn($alias . '.WEIGHT');
-            $criteria->addSelectColumn($alias . '.TAX');
+            $criteria->addSelectColumn($alias . '.TAX_RULE_TITLE');
+            $criteria->addSelectColumn($alias . '.TAX_RULE_DESCRIPTION');
             $criteria->addSelectColumn($alias . '.PARENT');
             $criteria->addSelectColumn($alias . '.CREATED_AT');
             $criteria->addSelectColumn($alias . '.UPDATED_AT');
diff --git a/core/lib/Thelia/Model/Map/TaxI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxI18nTableMap.php
index a06230c37..c50a30c90 100644
--- a/core/lib/Thelia/Model/Map/TaxI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/TaxI18nTableMap.php
@@ -143,7 +143,7 @@ class TaxI18nTableMap extends TableMap
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'tax', 'ID', true, null, null);
         $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
-        $this->addColumn('DESCRIPTION', 'Description', 'LONGVARCHAR', false, null, null);
+        $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
     } // initialize()
 
     /**
diff --git a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php
index 012ad2e72..24f8a41d7 100644
--- a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php
@@ -143,7 +143,7 @@ class TaxRuleI18nTableMap extends TableMap
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'tax_rule', 'ID', true, null, null);
         $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
-        $this->addColumn('DESCRIPTION', 'Description', 'LONGVARCHAR', false, null, null);
+        $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
     } // initialize()
 
     /**
diff --git a/core/lib/Thelia/Model/OrderAttributeCombination.php b/core/lib/Thelia/Model/OrderAttributeCombination.php
deleted file mode 100644
index 896cda895..000000000
--- a/core/lib/Thelia/Model/OrderAttributeCombination.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-use Thelia\Model\Base\OrderAttributeCombination as BaseOrderAttributeCombination;
-
-        class OrderAttributeCombination extends BaseOrderAttributeCombination
-{
-
-}
diff --git a/core/lib/Thelia/Model/OrderAttributeCombinationQuery.php b/core/lib/Thelia/Model/OrderAttributeCombinationQuery.php
deleted file mode 100644
index 72d842861..000000000
--- a/core/lib/Thelia/Model/OrderAttributeCombinationQuery.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-use Thelia\Model\Base\OrderAttributeCombinationQuery as BaseOrderAttributeCombinationQuery;
-
-
-/**
- * Skeleton subclass for performing query and update operations on the 'order_attribute_combination' 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 OrderAttributeCombinationQuery extends BaseOrderAttributeCombinationQuery
-{
-
-} // OrderAttributeCombinationQuery
diff --git a/install/thelia.sql b/install/thelia.sql
index 372698b7e..d8d8e46b3 100755
--- a/install/thelia.sql
+++ b/install/thelia.sql
@@ -772,7 +772,8 @@ CREATE TABLE `order_product`
     `was_new` TINYINT NOT NULL,
     `was_in_promo` TINYINT NOT NULL,
     `weight` VARCHAR(45),
-    `tax` FLOAT,
+    `tax_rule_title` VARCHAR(255),
+    `tax_rule_description` LONGTEXT,
     `parent` INTEGER COMMENT 'not managed yet',
     `created_at` DATETIME,
     `updated_at` DATETIME,
@@ -802,12 +803,12 @@ CREATE TABLE `order_status`
 ) ENGINE=InnoDB;
 
 -- ---------------------------------------------------------------------
--- order_attribute_combination
+-- order_product_attribute_combination
 -- ---------------------------------------------------------------------
 
-DROP TABLE IF EXISTS `order_attribute_combination`;
+DROP TABLE IF EXISTS `order_product_attribute_combination`;
 
-CREATE TABLE `order_attribute_combination`
+CREATE TABLE `order_product_attribute_combination`
 (
     `id` INTEGER NOT NULL AUTO_INCREMENT,
     `order_product_id` INTEGER NOT NULL,
@@ -822,8 +823,8 @@ CREATE TABLE `order_attribute_combination`
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
-    INDEX `idx_order_feature_order_product_id` (`order_product_id`),
-    CONSTRAINT `fk_order_feature_order_product_id`
+    INDEX `idx_order_product_attribute_combination_order_product_id` (`order_product_id`),
+    CONSTRAINT `fk_order_product_attribute_combination_order_product_id`
         FOREIGN KEY (`order_product_id`)
         REFERENCES `order_product` (`id`)
         ON UPDATE RESTRICT
@@ -1572,6 +1573,30 @@ CREATE TABLE `module_image`
         ON DELETE CASCADE
 ) ENGINE=InnoDB;
 
+-- ---------------------------------------------------------------------
+-- order_product_tax
+-- ---------------------------------------------------------------------
+
+DROP TABLE IF EXISTS `order_product_tax`;
+
+CREATE TABLE `order_product_tax`
+(
+    `id` INTEGER NOT NULL AUTO_INCREMENT,
+    `order_product_id` INTEGER NOT NULL,
+    `title` VARCHAR(255) NOT NULL,
+    `description` LONGTEXT,
+    `amount` FLOAT NOT NULL,
+    `created_at` DATETIME,
+    `updated_at` DATETIME,
+    PRIMARY KEY (`id`),
+    INDEX `idx_ order_product_tax_order_product_id` (`order_product_id`),
+    CONSTRAINT `fk_ order_product_tax_order_product_id0`
+        FOREIGN KEY (`order_product_id`)
+        REFERENCES `order_product` (`id`)
+        ON UPDATE RESTRICT
+        ON DELETE CASCADE
+) ENGINE=InnoDB;
+
 -- ---------------------------------------------------------------------
 -- category_i18n
 -- ---------------------------------------------------------------------
@@ -1646,7 +1671,7 @@ CREATE TABLE `tax_i18n`
     `id` INTEGER NOT NULL,
     `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
     `title` VARCHAR(255),
-    `description` TEXT,
+    `description` LONGTEXT,
     PRIMARY KEY (`id`,`locale`),
     CONSTRAINT `tax_i18n_FK_1`
         FOREIGN KEY (`id`)
@@ -1665,7 +1690,7 @@ CREATE TABLE `tax_rule_i18n`
     `id` INTEGER NOT NULL,
     `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
     `title` VARCHAR(255),
-    `description` TEXT,
+    `description` LONGTEXT,
     PRIMARY KEY (`id`,`locale`),
     CONSTRAINT `tax_rule_i18n_FK_1`
         FOREIGN KEY (`id`)
diff --git a/local/config/schema.xml b/local/config/schema.xml
index fb270534e..429a52e3f 100755
--- a/local/config/schema.xml
+++ b/local/config/schema.xml
@@ -101,7 +101,7 @@
     <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" />
+    <column name="description" type="CLOB" />
     <behavior name="timestampable" />
     <behavior name="i18n">
       <parameter name="i18n_columns" value="title, description" />
@@ -110,7 +110,7 @@
   <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" />
+    <column name="description" type="CLOB" />
     <column defaultValue="0" name="is_default" required="true" type="BOOLEAN" />
     <behavior name="timestampable" />
     <behavior name="i18n">
@@ -607,7 +607,8 @@
     <column name="was_new" required="true" type="TINYINT" />
     <column name="was_in_promo" required="true" type="TINYINT" />
     <column name="weight" size="45" type="VARCHAR" />
-    <column name="tax" type="FLOAT" />
+    <column name="tax_rule_title" size="255" type="VARCHAR" />
+    <column name="tax_rule_description" type="CLOB" />
     <column description="not managed yet" name="parent" type="INTEGER" />
     <foreign-key foreignTable="order" name="fk_order_product_order_id" onDelete="CASCADE" onUpdate="RESTRICT">
       <reference foreign="id" local="order_id" />
@@ -632,7 +633,7 @@
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
     </behavior>
   </table>
-  <table name="order_attribute_combination" namespace="Thelia\Model">
+  <table name="order_product_attribute_combination" 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="attribute_title" required="true" size="255" type="VARCHAR" />
@@ -643,10 +644,10 @@
     <column name="attribute_av_chapo" type="LONGVARCHAR" />
     <column name="attribute_av_description" type="CLOB" />
     <column name="attribute_av_postscriptum" type="LONGVARCHAR" />
-    <foreign-key foreignTable="order_product" name="fk_order_feature_order_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
+    <foreign-key foreignTable="order_product" name="fk_order_product_attribute_combination_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 name="idx_order_product_attribute_combination_order_product_id">
       <index-column name="order_product_id" />
     </index>
     <behavior name="timestampable" />
@@ -1236,4 +1237,18 @@
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
     </behavior>
   </table>
+  <table name="order_product_tax" 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="title" required="true" size="255" type="VARCHAR" />
+    <column name="description" type="CLOB" />
+    <column name="amount" required="true" type="FLOAT" />
+    <foreign-key foreignTable="order_product" name="fk_ order_product_tax_order_product_id0" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="order_product_id" />
+    </foreign-key>
+    <index name="idx_ order_product_tax_order_product_id">
+      <index-column name="order_product_id" />
+    </index>
+    <behavior name="timestampable" />
+  </table>
 </database>

From c255548d9bfdc97cca765b1f2624455dfeb5f367 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 20 Sep 2013 08:45:38 +0200
Subject: [PATCH 36/51] create dedicated file for menu

---
 templates/default/category.html               | 138 +++++-------------
 templates/default/includes/menu.html          |  27 ++++
 .../default/includes/single-product.html      |  60 ++++++++
 templates/default/index.html                  |   3 +-
 4 files changed, 126 insertions(+), 102 deletions(-)
 create mode 100644 templates/default/includes/menu.html
 create mode 100644 templates/default/includes/single-product.html

diff --git a/templates/default/category.html b/templates/default/category.html
index c75bd2159..aa6f95c08 100644
--- a/templates/default/category.html
+++ b/templates/default/category.html
@@ -29,67 +29,7 @@
                         {loop type="product" name="product_list" category={category attr="id"}}
 
                         <li class="item">
-                        <article itemscope itemtype="http://schema.org/Product">
-                            <!-- Use the meta tag to specify content that is not visible on the page in any way -->
-                            {$product_id=$ID}
-                            {loop name="brand.feature" type="feature" product=$ID title="brand"}
-                                {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
-                                            <meta itemprop="brand" content="{$TITLE}">
-                                {/loop}
-                            {/loop}
-                            {loop name="brand.feature" type="feature" product=$ID title="isbn"}
-                                {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
-                                    <meta itemprop="productID" content="isbn:{$TITLE}">
-                                {/loop}
-                            {/loop}
-
-                            <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
-                                {loop name="product_thumbnail" type="image" product=$ID width="218" height="146" resize_mode="borders" limit="1"}
-                                    <img itemprop="image" src="{$IMAGE_URL}" alt="Product #{$LOOP_COUNT}">
-                                {/loop}
-                                {elseloop rel="product_thumbnail"}
-                                    {images file='assets/img/218x146.png'}<img itemprop="image" src="{$asset_url}" alt="Product #{$LOOP_COUNT}">{/images}
-                                {/elseloop}
-                                <span class="mask"></span>
-                            </a>
-
-                            <div class="product-info">
-                                <h3 class="name"><a href="{$URL}"><span itemprop="name">{$TITLE}</span></a></h3>
-
-                                <div class="description" itemprop="description">
-                                    <p>{$DESCRIPTION}</p>
-                                </div>
-                            </div>
-
-                            <div class="product-price">
-                                <div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-                                    <meta itemprop="category" content="{category attr="title"}">
-                                    <meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition"> <!-- List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition -->
-                                    <meta itemprop="priceCurrency" content="{currency attr="symbol"}"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
-                                    <link itemprop="availability" href="http://schema.org/InStock" content="in_stock" />
-                                    <!-- List of availibility :
-                                        out_of_stock : http://schema.org/OutOfStock
-                                        in_stock : http://schema.org/InStock
-                                        instore_only : http://schema.org/InStoreOnly
-                                        preorder : http://schema.org/PreOrder
-                                        online_only : http://schema.org/OnlineOnly
-                                    -->
-                                    {if $IS_PROMO }
-                                        {loop name="productSaleElements_promo" type="product_sale_elements" product=$ID limit="1" order="min_price"}
-                                         {assign var="default_product_sale_elements" value=$ID}
-                                        <span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number=$TAXED_PROMO_PRICE} {currency attr="symbol"}</span></span>
-                                        <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number=$TAXED_PRICE} {currency attr="symbol"}</span></span>
-                                        {/loop}
-                                    {else}
-                                        <span class="regular-price"><span itemprop="price" class="price">{format_number number=$BEST_TAXED_PRICE} {currency attr="symbol"}</span></span>
-                                    {/if}
-
-                                </div>
-                                <div class="product-btn">
-                                    <button class="btn btn-cart">Add to cart</button>
-                                </div>
-                            </div>
-                        </article><!-- /product -->
+                            {include file="includes/single-product.html" product_id=$ID}
                         </li>
                         {/loop}
                     </ul>
@@ -100,33 +40,7 @@
 
         <aside class="col-left" role="complementary" itemscope itemtype="http://schema.org/WPSideBar">
 
-            <section id="categories" class="block block-nav" role="navigation" aria-labelledby="categories-label">
-                <div class="block-heading"><h3 class="block-title" id="categories-label">{intl l="Categories"}</h3></div>
-                <div class="block-content">
-                    <nav class="nav-categories">
-                        <ul id="category" class="accordion">
-                            {assign "previousLevel" 0}
-                            {loop name="cat-parent" type="category-tree" category="0"}
-
-                                {for $foo=1 to $previousLevel-$LEVEL}
-                                        </ul>
-                                    </li>
-                                {/for}
-
-                                    {if $CHILD_COUNT > 0 }
-                                    <li><a class="accordion-toggle" data-toggle="collapse" data-parent="#category" href="#collapse{$ID}">{$TITLE}<span class="amount">({$CHILD_COUNT})</span></a>
-
-                                        <ul id="collapse{$ID}" class="collapse">
-                                    {else}
-
-                                        <li><a href="#">{$TITLE}<span class="amount">(0)</span></a></li>
-                                    {/if}
-                                {assign "previousLevel" $LEVEL}
-                            {/loop}
-                        </ul>
-                    </nav>
-                </div>
-            </section>
+            {include file="includes/menu.html"}
 
             <section id="filters">
                 <h3>Find <span>a product</span></h3>
@@ -135,13 +49,21 @@
                         <fieldset>
                             <legend class="filter-heading">Type</legend>
                             <div class="filter-content">
-                                <?php for ($count = 1; $count <= $type; $count++) { ?>
                                 <div class="checkbox">
-                                    <label for="type<?php echo $count; ?>">
-                                        <input type="checkbox" name="type<?php echo $count; ?>" id="type<?php echo $count; ?>"<?php if(isset($_GET['type'. $count])) { echo ' checked'; }?> value="<?php echo $count; ?>"> Type <?php echo $count; ?>
+                                    <label for="type0">
+                                        <input type="checkbox" name="type0" id="type0" value="0"> Type 0
+                                    </label>
+                                </div>
+                                <div class="checkbox">
+                                    <label for="type1">
+                                        <input type="checkbox" name="type1" id="type1" value="1"> Type 1
+                                    </label>
+                                </div>
+                                <div class="checkbox">
+                                    <label for="type2">
+                                        <input type="checkbox" name="type2" id="type2" value="2"> Type 2
                                     </label>
                                 </div>
-                                <?php } ?>
                             </div>
                         </fieldset>
                     </div><!-- /Filter Type -->
@@ -150,13 +72,21 @@
                         <fieldset>
                             <legend class="filter-heading">Price</legend>
                             <div class="filter-content">
-                                <?php foreach ($price as $key => $value) { ?>
                                 <div class="checkbox">
-                                    <label for="price<?php echo $key; ?>">
-                                        <input type="checkbox" name="price<?php echo $key; ?>" id="price<?php echo $key; ?>"<?php if(isset($_GET['price'. $key])) { echo ' checked'; }?> value="<?php echo $value; ?>"> <?php echo $value; ?>
+                                    <label for="price0">
+                                        <input type="checkbox" name="price0" id="price0" value="0"> $0.00 - $99.99
+                                    </label>
+                                </div>
+                                <div class="checkbox">
+                                    <label for="price1">
+                                        <input type="checkbox" name="price1" id="price1" value="1"> $100.00 - $199.99
+                                    </label>
+                                </div>
+                                <div class="checkbox">
+                                    <label for="price2">
+                                        <input type="checkbox" name="price2" id="price2" value="2"> $200.00 and above
                                     </label>
                                 </div>
-                                <?php } ?>
                             </div>
                         </fieldset>
                     </div><!-- /Filter Price -->
@@ -165,13 +95,21 @@
                         <fieldset>
                             <legend class="filter-heading">Size</legend>
                             <div class="filter-content">
-                                <?php foreach ($size as $key => $value) { ?>
                                 <div class="checkbox">
-                                    <label for="size<?php echo $key; ?>">
-                                        <input type="checkbox" name="size<?php echo $key; ?>" id="size<?php echo $key; ?>"<?php if(isset($_GET['size'. $key])) { echo ' checked'; }?> value="<?php echo $key; ?>"> <?php echo $value; ?>
+                                    <label for="size0">
+                                        <input type="checkbox" name="size0" id="size0" value="0"> Large
+                                    </label>
+                                </div>
+                                <div class="checkbox">
+                                    <label for="size1">
+                                        <input type="checkbox" name="size1" id="size1" value="1"> Medium
+                                    </label>
+                                </div>
+                                <div class="checkbox">
+                                    <label for="size2">
+                                        <input type="checkbox" name="size2" id="size2" value="2"> Small
                                     </label>
                                 </div>
-                                <?php } ?>
                             </div>
                         </fieldset>
                     </div><!-- /Filter Size -->
diff --git a/templates/default/includes/menu.html b/templates/default/includes/menu.html
new file mode 100644
index 000000000..083c74ef2
--- /dev/null
+++ b/templates/default/includes/menu.html
@@ -0,0 +1,27 @@
+<section id="categories" class="block block-nav" role="navigation" aria-labelledby="categories-label">
+    <div class="block-heading"><h3 class="block-title" id="categories-label">{intl l="Categories"}</h3></div>
+    <div class="block-content">
+        <nav class="nav-categories">
+            <ul id="category" class="accordion">
+                {assign "previousLevel" 0}
+                {loop name="cat-parent" type="category-tree" category="0"}
+
+                {for $foo=1 to $previousLevel-$LEVEL}
+            </ul>
+            </li>
+            {/for}
+
+            {if $CHILD_COUNT > 0 }
+            <li><a class="accordion-toggle" data-toggle="collapse" data-parent="#category" href="{$URL}#collapse{$ID}">{$TITLE} <span class="amount">({$CHILD_COUNT})</span></a>
+
+                <ul id="collapse{$ID}" class="collapse">
+                    {else}
+
+                    <li><a href="{$URL}">{$TITLE} <span class="amount">(0)</span></a></li>
+                    {/if}
+                    {assign "previousLevel" $LEVEL}
+                    {/loop}
+                </ul>
+        </nav>
+    </div>
+</section>
\ No newline at end of file
diff --git a/templates/default/includes/single-product.html b/templates/default/includes/single-product.html
new file mode 100644
index 000000000..40b9d326b
--- /dev/null
+++ b/templates/default/includes/single-product.html
@@ -0,0 +1,60 @@
+<article itemscope itemtype="http://schema.org/Product">
+    <!-- Use the meta tag to specify content that is not visible on the page in any way -->
+    {loop name="brand.feature" type="feature" product=$ID title="brand"}
+    {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
+        <meta itemprop="brand" content="{$TITLE}">
+    {/loop}
+    {/loop}
+    {loop name="brand.feature" type="feature" product=$ID title="isbn"}
+    {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
+        <meta itemprop="productID" content="isbn:{$TITLE}">
+    {/loop}
+    {/loop}
+
+    <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
+        {loop name="product_thumbnail" type="image" product=$ID width="218" height="146" resize_mode="borders" limit="1"}
+            <img itemprop="image" src="{$IMAGE_URL}" alt="Product #{$LOOP_COUNT}">
+        {/loop}
+        {elseloop rel="product_thumbnail"}
+            {images file='../assets/img/218x146.png'}<img itemprop="image" src="{$asset_url}" alt="Product #{$LOOP_COUNT}">{/images}
+        {/elseloop}
+        <span class="mask"></span>
+    </a>
+
+    <div class="product-info">
+        <h3 class="name"><a href="{$URL}"><span itemprop="name">{$TITLE}</span></a></h3>
+
+        <div class="description" itemprop="description">
+            <p>{$DESCRIPTION}</p>
+        </div>
+    </div>
+
+    <div class="product-price">
+        <div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
+            <meta itemprop="category" content="{category attr="title"}">
+            <meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition"> <!-- List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition -->
+            <meta itemprop="priceCurrency" content="{currency attr="symbol"}"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
+            <link itemprop="availability" href="http://schema.org/InStock" content="in_stock" />
+            <!-- List of availibility :
+                out_of_stock : http://schema.org/OutOfStock
+                in_stock : http://schema.org/InStock
+                instore_only : http://schema.org/InStoreOnly
+                preorder : http://schema.org/PreOrder
+                online_only : http://schema.org/OnlineOnly
+            -->
+            {if $IS_PROMO }
+                {loop name="productSaleElements_promo" type="product_sale_elements" product=$ID limit="1" order="min_price"}
+                {assign var="default_product_sale_elements" value=$ID}
+                    <span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number=$TAXED_PROMO_PRICE} {currency attr="symbol"}</span></span>
+                    <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number=$TAXED_PRICE} {currency attr="symbol"}</span></span>
+                {/loop}
+            {else}
+                <span class="regular-price"><span itemprop="price" class="price">{format_number number=$BEST_TAXED_PRICE} {currency attr="symbol"}</span></span>
+            {/if}
+
+        </div>
+        <div class="product-btn">
+            <button class="btn btn-cart">Add to cart</button>
+        </div>
+    </div>
+</article><!-- /product -->
\ No newline at end of file
diff --git a/templates/default/index.html b/templates/default/index.html
index ca6fbbf7c..674892ce9 100644
--- a/templates/default/index.html
+++ b/templates/default/index.html
@@ -80,8 +80,7 @@
                                             preorder : http://schema.org/PreOrder
                                             online_only : http://schema.org/OnlineOnly
                                     -->
-                                    <span class="regular-price"><span itemprop="price" class="price">{currency attr="symbol"} {format_number number="{$BEST_TAXED_PRICE}"}
-</span></span>
+                                    <span class="regular-price"><span itemprop="price" class="price">{format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"}</span></span>
                                 </div>
                             </div>
                         </a>

From 16de9bbcc92930779503a9a8c18e4439e2fc37f6 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 20 Sep 2013 09:19:12 +0200
Subject: [PATCH 37/51] allow displaying how much product wanted in category
 page

---
 .../Template/Smarty/Plugins/UrlGenerator.php  |  3 ++-
 templates/default/assets/js/script.js         | 27 +++----------------
 templates/default/category.html               |  6 ++---
 .../default/includes/category-toolbar.html    | 14 +++++-----
 4 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php
index aa96a0014..f1249697a 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php
@@ -186,7 +186,8 @@ class UrlGenerator extends AbstractSmartyPlugin
 
     protected function getCurrentUrl()
     {
-        return URL::getInstance()->retrieveCurrent($this->request)->toString();
+        //return URL::getInstance()->retrieveCurrent($this->request)->toString();
+        return $this->request->getUri();
     }
 
     protected function getReturnToUrl()
diff --git a/templates/default/assets/js/script.js b/templates/default/assets/js/script.js
index 18581ed1e..2bbba577f 100644
--- a/templates/default/assets/js/script.js
+++ b/templates/default/assets/js/script.js
@@ -126,31 +126,10 @@
             }).filter(':has(:checked)').addClass('active');
         });
 
+        $('#limit-top').change(function(e){
+            window.location = $(this).val()
+        });
 
-        // Styliser le message Confirm par Bootstrap sur un formulaire
-        /*
-         $('body').on('click', '[data-confirm]', function(){
-         var $this = $(this);
-         bootbox.confirm($(this).attr('data-confirm'),
-         function(result){
-         if(result) {
-         // Si lien
-         if($this.attr('href')){
-         window.location.href = $this.attr('href');
-         }else{
-         // Si on doit soumettre un formulaire
-         var $form = $this.closest("form");
-         if($form.size() > 0){
-         $form.submit();
-         }
-         }
-         }
-         }
-         );
-
-         return false;
-         });
-         */
     });
 
 })(jQuery);
diff --git a/templates/default/category.html b/templates/default/category.html
index aa6f95c08..5c1516f45 100644
--- a/templates/default/category.html
+++ b/templates/default/category.html
@@ -20,13 +20,13 @@
 
 {block name="main-content"}
     <div class="main layout-col-2-left">
-
+        {$limit={$smarty.get.limit|default:8}}
         <article class="col-main {$smarty.get.mode|default:"grid"}" role="main">
-            {include file="includes/category-toolbar.html" toolbar="top"}
+            {include file="includes/category-toolbar.html" toolbar="top" limit=$limit}
             <div id="category-products">
                 <div class="products-content">
                     <ul class="product-col-4">
-                        {loop type="product" name="product_list" category={category attr="id"}}
+                        {loop type="product" name="product_list" category={category attr="id"} limit=$limit}
 
                         <li class="item">
                             {include file="includes/single-product.html" product_id=$ID}
diff --git a/templates/default/includes/category-toolbar.html b/templates/default/includes/category-toolbar.html
index 98ce01434..8268d6393 100644
--- a/templates/default/includes/category-toolbar.html
+++ b/templates/default/includes/category-toolbar.html
@@ -5,11 +5,11 @@
             <span class="limiter">
                 <label for="limit-top">Show</label>
                 <select id="limit-top" name="limit">
-                    <option value="?limit=4">4</option>
-                    <option value="?limit=8" selected>8</option>
-                    <option value="?limit=12">12</option>
-                    <option value="?limit=50">50</option>
-                    <option value="?limit=all">All</option>
+                    <option value="{url path="{navigate to="current"}" limit="4"}" {if $limit==4}selected{/if}>4</option>
+                    <option value="{url path="{navigate to="current"}" limit="8"}" {if $limit==8}selected{/if}>8</option>
+                    <option value="{url path="{navigate to="current"}" limit="12"}" {if $limit==12}selected{/if}>12</option>
+                    <option value="{url path="{navigate to="current"}" limit="50"}"{if $limit==50}selected{/if}>50</option>
+                    <option value="{url path="{navigate to="current"}" limit="9999999999"}" {if $limit==9999999999}selected{/if}>All</option>
                 </select>
                 <span class="per-page"> per page</span>
             </span><!-- /.limiter -->
@@ -30,8 +30,8 @@
             <span class="view-mode">
                 <span class="view-mode-label">{intl l="View as"}:</span>
                 <span class="view-mode-btn">
-                    <a href="?mode=grid" data-toggle="view" role="button" class="btn btn-grid"><i class="icon-grid"></i></a>
-                    <a href="?mode=list" data-toggle="view" role="button" class="btn btn-list "><i class="icon-list"></i></a>
+                    <a href="{url path="{navigate to="current"}" mode="grid"}" data-toggle="view" role="button" class="btn btn-grid"><i class="icon-grid"></i></a>
+                    <a href="{url path="{navigate to="current"}" mode="list"}" data-toggle="view" role="button" class="btn btn-list "><i class="icon-list"></i></a>
                 </span>
             </span><!-- /.view-mode -->
 

From 5abae4db7dd117d37b35634d6511bb06b352f8dd Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Fri, 20 Sep 2013 09:35:56 +0200
Subject: [PATCH 38/51] Setting profile update

---
 core/lib/Thelia/Config/Resources/config.xml   |  2 +
 .../Thelia/Form/ProfileModificationForm.php   | 91 +++++++++++++++++++
 templates/admin/default/profile-edit.html     | 80 ++++++++++++++++
 3 files changed, 173 insertions(+)
 create mode 100644 core/lib/Thelia/Form/ProfileModificationForm.php

diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 43e48f6e4..8f5a78b59 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -102,6 +102,8 @@
         <form name="thelia.admin.country.creation" class="Thelia\Form\CountryCreationForm"/>
         <form name="thelia.admin.country.modification" class="Thelia\Form\CountryModificationForm"/>
 
+        <form name="thelia.admin.profile.modification" class="Thelia\Form\ProfileModificationForm"/>
+
     </forms>
 
 
diff --git a/core/lib/Thelia/Form/ProfileModificationForm.php b/core/lib/Thelia/Form/ProfileModificationForm.php
new file mode 100644
index 000000000..94ce1fba9
--- /dev/null
+++ b/core/lib/Thelia/Form/ProfileModificationForm.php
@@ -0,0 +1,91 @@
+<?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\Form;
+
+use Symfony\Component\Validator\Constraints;
+use Thelia\Core\Translation\Translator;
+use Thelia\Model\ConfigQuery;
+
+/**
+ * Class ProfileModification
+ * @package Thelia\Form
+ * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ */
+class ProfileModificationForm extends BaseForm
+{
+
+
+    protected function buildForm()
+    {
+
+        $this->formBuilder
+            ->add("firstname", "text", array(
+                "constraints" => array(
+                    new Constraints\NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("First Name"),
+                "label_attr" => array(
+                    "for" => "firstname"
+                )
+            ))
+            ->add("lastname", "text", array(
+                "constraints" => array(
+                    new Constraints\NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Last Name"),
+                "label_attr" => array(
+                    "for" => "lastname"
+                )
+            ))
+            ->add("password", "password", array(
+                "constraints" => array(
+                    new Constraints\NotBlank(),
+                    new Constraints\Length(array("min" => ConfigQuery::read("password.length", 4)))
+                ),
+                "label" => Translator::getInstance()->trans("Password"),
+                "label_attr" => array(
+                    "for" => "password"
+                )
+            ))
+            ->add("password_confirm", "password", array(
+                "constraints" => array(
+                    new Constraints\NotBlank(),
+                    new Constraints\Length(array("min" => ConfigQuery::read("password.length", 4))),
+                    new Constraints\Callback(array("methods" => array(
+                        array($this, "verifyPasswordField")
+                    )))
+                ),
+                "label" => "Password confirmation",
+                "label_attr" => array(
+                    "for" => "password_confirmation"
+                )
+            ))
+        ;
+    }
+
+    public function getName()
+    {
+        return "thelia_profile_modification";
+    }
+}
diff --git a/templates/admin/default/profile-edit.html b/templates/admin/default/profile-edit.html
index e69de29bb..19b6c4c2d 100644
--- a/templates/admin/default/profile-edit.html
+++ b/templates/admin/default/profile-edit.html
@@ -0,0 +1,80 @@
+{extends file="admin-layout.tpl"}
+
+{block name="page-title"}{intl l='Edit profile'}{/block}
+
+{block name="check-permissions"}admin.profile.edit{/block}
+
+{block name="main-content"}
+    <div class="profile edit-profile">
+
+        <div id="wrapper" class="container">
+
+                <ul class="breadcrumb">
+        			<li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
+                    <li>{intl l='Editing profile "%name"' name="{$NAME}"}</li>
+                </ul>
+
+        		<div class="row">
+        			<div class="col-md-12 general-block-decorator">
+
+    					<div class="col-md-12 title title-without-tabs">
+    					   {intl l="Edit profile $NAME"}
+    					</div>
+
+                        <div class="form-container">
+                            {form name="thelia.admin.profile.modification"}
+                                <form method="POST" action="{url path="/admin/profile/update/{$ID}"}" {form_enctype form=$form} class="clearfix">
+
+                                    {form_hidden_fields form=$form}
+
+                                    {form_field form=$form field='success_url'}
+                                        <input type="hidden" name="{$name}" value="{url path="/admin/profile/update/{$ID}"}" />
+                                    {/form_field}
+
+                                    {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
+
+                                    {form_field form=$form field='firstname'}
+                                        <div class="form-group {if $error}has-error{/if}">
+                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$FIRSTNAME}" title="{intl l="{$label}"}" placeholder="{intl l='Firstname'}">
+                                        </div>
+                                    {/form_field}
+
+                                    {form_field form=$form field='lastname'}
+                                        <div class="form-group {if $error}has-error{/if}">
+                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$LASTNAME}" title="{intl l="{$label}"}" placeholder="{intl l='Lastname'}">
+                                        </div>
+                                    {/form_field}
+
+                                    {form_field form=$form field='password'}
+                                        <div class="form-group {if $error}has-error{/if}">
+                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$LASTNAME}" title="{intl l="{$label}"}" placeholder="{intl l='Password'}">
+                                        </div>
+                                    {/form_field}
+
+                                    {form_field form=$form field='password_confirm'}
+                                        <div class="form-group {if $error}has-error{/if}">
+                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$LASTNAME}" title="{intl l="{$label}"}" placeholder="{intl l='Password confirmation'}">
+                                        </div>
+                                    {/form_field}
+                                    
+                                    <div class="text-right">
+                                        <button type="submit" class="btn btn-default btn-primary" title="{intl l='Edit profile'}">
+                                            {intl l="Edit"}
+                                            <span class="glyphicon glyphicon-ok"></span>
+                                        </button>
+                                    </div>
+                                </form>
+                            {/form}
+    					</div>
+        				
+        			</div>
+
+        		</div>    		
+
+        </div>
+    </div>
+{/block}
\ No newline at end of file

From f7d2c09c6d883a60ccc3e281e0adb611141c375e Mon Sep 17 00:00:00 2001
From: franck <franck@cqfdev.fr>
Date: Fri, 20 Sep 2013 09:38:48 +0200
Subject: [PATCH 39/51] Added producr attributes routes

---
 core/lib/Thelia/Config/Resources/config.xml        | 2 +-
 core/lib/Thelia/Config/Resources/routing/admin.xml | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 43e48f6e4..495cf2ac3 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -18,7 +18,7 @@
         <loop class="Thelia\Core\Template\Loop\Currency" name="currency"/>
         <loop class="Thelia\Core\Template\Loop\Customer" name="customer"/>
         <loop class="Thelia\Core\Template\Loop\Feature" name="feature"/>
-        <loop class="Thelia\Core\Template\Loop\FeatureAvailability" name="feature_availability"/>
+        <loop class="Thelia\Core\Template\Loop\FeatureAvailability" name="feature-availability"/>
         <loop class="Thelia\Core\Template\Loop\FeatureValue" name="feature_value"/>
         <loop class="Thelia\Core\Template\Loop\Folder" name="folder"/>
         <loop class="Thelia\Core\Template\Loop\Order" name="order"/>
diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index 284103798..5c07d48c2 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -178,6 +178,12 @@
         <default key="_controller">Thelia\Controller\Admin\ProductController::updateAccessoryPositionAction</default>
     </route>
 
+    <!--Features and attributes -->
+
+    <route id="admin.products.update-attributes-and-features" path="/admin/product/{productId}/update-attributes-and-features">
+        <default key="_controller">Thelia\Controller\Admin\ProductController::updateAttributesAndFeaturesAction</default>
+    </route>
+
 
     <!--  Folder routes management -->
     <route id="admin.folders.default" path="/admin/folders">

From cb5f6d4c7027bfe9bc9382e584671c9428587318 Mon Sep 17 00:00:00 2001
From: franck <franck@cqfdev.fr>
Date: Fri, 20 Sep 2013 09:57:30 +0200
Subject: [PATCH 40/51] Fixed translations

---
 templates/admin/default/home.html | 156 +++++++++++++++---------------
 1 file changed, 78 insertions(+), 78 deletions(-)

diff --git a/templates/admin/default/home.html b/templates/admin/default/home.html
index ea1bd3392..3371a1d9f 100755
--- a/templates/admin/default/home.html
+++ b/templates/admin/default/home.html
@@ -21,8 +21,8 @@
 
 				<div class="text-center clearfix">
 					<div class="btn-group">
-						<button type="button" class="btn btn-default active" data-toggle="jqplot" data-target="turnover"><span class="glyphicon glyphicon-euro"></span> {intl l="Turnover"}</button>
-						<button type="button" class="btn btn-primary" data-toggle="jqplot" data-target="registration"><span class="glyphicon glyphicon-user"></span> {intl l="Registrations"}</button>
+						<button type="button" class="btn btn-default active" data-toggle="jqplot" data-target="sales"><span class="glyphicon glyphicon-euro"></span> {intl l="Sales"}</button>
+						<button type="button" class="btn btn-primary" data-toggle="jqplot" data-target="registration"><span class="glyphicon glyphicon-user"></span> {intl l="New customers"}</button>
 						<button type="button" class="btn btn-success" data-toggle="jqplot" data-target="orders"><span class="glyphicon glyphicon-shopping-cart"></span> {intl l="Orders"}</button>
 						<button type="button" class="btn btn-info" data-toggle="jqplot" data-target="first-orders"><span class="glyphicon glyphicon-thumbs-up"></span> {intl l="First orders"}</button>
 						<button type="button" class="btn btn-danger" data-toggle="jqplot" data-target="aborted-orders"><span class="glyphicon glyphicon-thumbs-down"></span> {intl l="Aborted orders"}</button>
@@ -34,7 +34,7 @@
 				<div class="jqplot-content">
 					<div id="jqplot"></div>
 
-					<div id="turnover" data-toggle="jqplot-serie" class="active"></div>
+					<div id="sales" data-toggle="jqplot-serie" class="active"></div>
 					<div id="registration" data-toggle="jqplot-serie"></div>
 					<div id="orders" data-toggle="jqplot-serie"></div>
 					<div id="first-orders" data-toggle="jqplot-serie"></div>
@@ -47,7 +47,7 @@
 	 		<div class="row">
 	 			<div class="col-md-4">
 					<div class="general-block-decorator">
-						<div class="title title-without-tabs">{intl l="Informations site"}</div>
+						<div class="title title-without-tabs">{intl l="Shop Informations"}</div>
 						<div class="table-responsive">
 							<table class="table table-striped">
 								<tbody>
@@ -56,7 +56,7 @@
 		                                <td>1</td>
 									</tr>
 									<tr>
-										<th>{intl l="Sections"}</th>
+										<th>{intl l="Categories"}</th>
 		                                <td>8</td>
 									</tr>
 									<tr>
@@ -64,11 +64,11 @@
 		                                <td>43</td>
 									</tr>
 									<tr>
-										<th>{intl l="Products online"}</th>
+										<th>{intl l="Online products"}</th>
 		                                <td>43</td>
 									</tr>
 									<tr>
-										<th>{intl l="Products offline"}</th>
+										<th>{intl l="Offline products"}</th>
 		                                <td>0</td>
 									</tr>
 									<tr>
@@ -76,11 +76,11 @@
 		                                <td>1</td>
 									</tr>
 									<tr>
-										<th>{intl l="Orders pending"}</th>
+										<th>{intl l="Pending orders"}</th>
 		                                <td>1</td>
 									</tr>
 									<tr>
-										<th>{intl l="Orders treatment"}</th>
+										<th>{intl l="In process orderst"}</th>
 		                                <td>0</td>
 									</tr>
 									<tr>
@@ -112,32 +112,32 @@
 								<div class="table-responsive">
 									<table class="table table-striped">
 		                                <tbody>
-		                                	<tr>
-		                                        <th>{intl l="C. A. TTC"}</th>
-		                                        <td>2000.00 €</td>
-		                                    </tr>
+                                            <tr>
+                                                <th>{intl l="Overall sales"}</th>
+                                                <td>2500.00 €</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Sales excluding shipping"}</th>
+                                                <td>2000.00 €</td>
+                                            </tr>
 		                                    <tr>
-		                                        <th>{intl l="C. A. TTC hors frais de port"}</th>
-		                                        <td>2500.00 €</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="C. A. TTC précédent"}</th>
+		                                        <th>{intl l="Yesterday sales"}</th>
 		                                        <td>1700.00 €</td>
 		                                    </tr>
 		                                    <tr>
-		                                        <th>{intl l="Commandes en instance"}</th>
+		                                        <th>{intl l="Waiting orders"}</th>
 		                                        <td>4</td>
 		                                    </tr>
 		                                    <tr>
-		                                        <th>{intl l="Commandes en traitement"}</th>
+		                                        <th>{intl l="In process orders"}</th>
 		                                        <td>52</td>
 		                                    </tr>
 		                                    <tr>
-		                                        <th>{intl l="Commandes annulées"}</th>
+		                                        <th>{intl l="Canceled orders"}</th>
 		                                        <td>3</td>
 		                                    </tr>
 		                                    <tr>
-		                                        <th>{intl l="Panier moyen TTC"}</th>
+		                                        <th>{intl l="Average cart"}</th>
 		                                        <td>25.00 €</td>
 		                                    </tr>
 		                           		</tbody>
@@ -148,34 +148,34 @@
 								<div class="table-responsive">
 		                            <table class="table table-striped">
 		                                <tbody>
-		                                	<tr>
-		                                        <th>{intl l="C. A. TTC"}</th>
-		                                        <td>2000.00 €</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="C. A. TTC hors frais de port"}</th>
-		                                        <td>2500.00 €</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="C. A. TTC précédent"}</th>
-		                                        <td>1700.00 €</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="Commandes en instance"}</th>
-		                                        <td>4</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="Commandes en traitement"}</th>
-		                                        <td>52</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="Commandes annulées"}</th>
-		                                        <td>3</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="Panier moyen TTC"}</th>
-		                                        <td>25.00 €</td>
-		                                    </tr>
+                                            <tr>
+                                                <th>{intl l="Overall sales"}</th>
+                                                <td>2500.00 €</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Sales excluding shipping"}</th>
+                                                <td>2000.00 €</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Previous month sales"}</th>
+                                                <td>1700.00 €</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Waiting orders"}</th>
+                                                <td>4</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="In process orders"}</th>
+                                                <td>52</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Canceled orders"}</th>
+                                                <td>3</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Average cart"}</th>
+                                                <td>25.00 €</td>
+                                            </tr>
 		                           		</tbody>
 		                        	</table>
 		                        </div>
@@ -184,34 +184,34 @@
 								<div class="table-responsive">
 		                            <table class="table table-striped">
 		                                <tbody>
-		                                	<tr>
-		                                        <th>{intl l="C. A. TTC"}</th>
-		                                        <td>2000.00 €</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="C. A. TTC hors frais de port"}</th>
-		                                        <td>2500.00 €</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="C. A. TTC précédent"}</th>
-		                                        <td>1700.00 €</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="Commandes en instance"}</th>
-		                                        <td>4</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="Commandes en traitement"}</th>
-		                                        <td>52</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="Commandes annulées"}</th>
-		                                        <td>3</td>
-		                                    </tr>
-		                                    <tr>
-		                                        <th>{intl l="Panier moyen TTC"}</th>
-		                                        <td>25.00 €</td>
-		                                    </tr>
+                                            <tr>
+                                                <th>{intl l="Overall sales"}</th>
+                                                <td>2500.00 €</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Sales excluding shipping"}</th>
+                                                <td>2000.00 €</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Previous year sales"}</th>
+                                                <td>1700.00 €</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Waiting orders"}</th>
+                                                <td>4</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="In process orders"}</th>
+                                                <td>52</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Canceled orders"}</th>
+                                                <td>3</td>
+                                            </tr>
+                                            <tr>
+                                                <th>{intl l="Average cart"}</th>
+                                                <td>25.00 €</td>
+                                            </tr>
 		                           		</tbody>
 		                            </table>
 		                        </div>

From b933a96c8eb7ca42db745ccadce2b48924e45278 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Fri, 20 Sep 2013 10:39:02 +0200
Subject: [PATCH 41/51] Vertical align middle tables

---
 .../default/assets/less/thelia/tables.less    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/templates/admin/default/assets/less/thelia/tables.less b/templates/admin/default/assets/less/thelia/tables.less
index 8a4baa897..e542786ec 100755
--- a/templates/admin/default/assets/less/thelia/tables.less
+++ b/templates/admin/default/assets/less/thelia/tables.less
@@ -1,3 +1,22 @@
+// Baseline styles
+
+.table {
+
+  // Cells
+  thead,
+  tbody,
+  tfoot {
+    > tr {
+      > th,
+      > td {
+        vertical-align: middle;
+      }
+    }
+  }
+  
+}
+
+
 tfoot{
 
 	.pagination{

From 265da6a57ebbeda60c579c81a612ac331f5bb329 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Fri, 20 Sep 2013 12:00:39 +0200
Subject: [PATCH 42/51] Add default language & editing language default field

---
 .../Thelia/Form/ProfileModificationForm.php   | 28 +++++++++
 templates/admin/default/profile-edit.html     | 62 ++++++++++++++++---
 2 files changed, 82 insertions(+), 8 deletions(-)

diff --git a/core/lib/Thelia/Form/ProfileModificationForm.php b/core/lib/Thelia/Form/ProfileModificationForm.php
index 94ce1fba9..e3119cfee 100644
--- a/core/lib/Thelia/Form/ProfileModificationForm.php
+++ b/core/lib/Thelia/Form/ProfileModificationForm.php
@@ -58,6 +58,34 @@ class ProfileModificationForm extends BaseForm
                     "for" => "lastname"
                 )
             ))
+            ->add("default_language", "text", array(
+                "constraints" => array(
+                    new Constraints\NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Default language"),
+                "label_attr" => array(
+                    "for" => "default_language"
+                )
+            ))
+            ->add("editing_language_default", "text", array(
+                "constraints" => array(
+                    new Constraints\NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Editing language default"),
+                "label_attr" => array(
+                    "for" => "editing_language_default"
+                )
+            ))
+            ->add("old_password", "password", array(
+                "constraints" => array(
+                    new Constraints\NotBlank(),
+                    new Constraints\Length(array("min" => ConfigQuery::read("password.length", 4)))
+                ),
+                "label" => Translator::getInstance()->trans("Old password"),
+                "label_attr" => array(
+                    "for" => "old_password"
+                )
+            ))
             ->add("password", "password", array(
                 "constraints" => array(
                     new Constraints\NotBlank(),
diff --git a/templates/admin/default/profile-edit.html b/templates/admin/default/profile-edit.html
index 19b6c4c2d..e882dc40d 100644
--- a/templates/admin/default/profile-edit.html
+++ b/templates/admin/default/profile-edit.html
@@ -47,20 +47,55 @@
                                         </div>
                                     {/form_field}
 
-                                    {form_field form=$form field='password'}
+                                    {form_field form=$form field='default_language'}
                                         <div class="form-group {if $error}has-error{/if}">
                                             <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
-                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$LASTNAME}" title="{intl l="{$label}"}" placeholder="{intl l='Password'}">
-                                        </div>
-                                    {/form_field}
 
-                                    {form_field form=$form field='password_confirm'}
-                                        <div class="form-group {if $error}has-error{/if}">
-                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
-                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$LASTNAME}" title="{intl l="{$label}"}" placeholder="{intl l='Password confirmation'}">
+                                            <select name="{$name}" id="{$label_attr.for}" data-toggle="selectpicker">
+                                                {loop type="lang" name="default_language" backend_context="1"}
+                                                    <option value="{$ID}" {if $ID == $TITLE}selected{/if}>{$TITLE}</option>
+                                                {/loop}
+                                            </select>
                                         </div>
                                     {/form_field}
                                     
+                                    {form_field form=$form field='editing_language_default'}
+                                        <div class="form-group {if $error}has-error{/if}">
+                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+
+                                            <select name="{$name}" id="{$label_attr.for}"  data-toggle="selectpicker">
+                                                {loop type="lang" name="editing_language_default" backend_context="1"}
+                                                    <option value="{$ID}" {if $ID == $TITLE}selected{/if}>{$TITLE}</option>
+                                                {/loop}
+                                            </select>
+                                        </div>
+                                    {/form_field}
+                                    
+                                    <div class="well">
+                                        <div class="title title-without-tabs">{intl l="Change password"}</div>
+
+                                        {form_field form=$form field='old_password'}
+                                            <div class="form-group {if $error}has-error{/if}">
+                                                <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" title="{intl l="{$label}"}" placeholder="{intl l='Old password'}">
+                                            </div>
+                                        {/form_field}
+
+                                        {form_field form=$form field='password'}
+                                            <div class="form-group {if $error}has-error{/if}">
+                                                <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" title="{intl l="{$label}"}" placeholder="{intl l='Password'}">
+                                            </div>
+                                        {/form_field}
+
+                                        {form_field form=$form field='password_confirm'}
+                                            <div class="form-group {if $error}has-error{/if}">
+                                                <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" title="{intl l="{$label}"}" placeholder="{intl l='Password confirmation'}">
+                                            </div>
+                                        {/form_field}
+                                    </div>
+                                    
                                     <div class="text-right">
                                         <button type="submit" class="btn btn-default btn-primary" title="{intl l='Edit profile'}">
                                             {intl l="Edit"}
@@ -77,4 +112,15 @@
 
         </div>
     </div>
+{/block}
+
+{block name="javascript-initialization"}
+
+    {javascripts file='assets/js/bootstrap-select/bootstrap-select.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
+    {javascripts file='assets/js/main.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
+
 {/block}
\ No newline at end of file

From bb40086e2ae1b4d85d68bfba6ecec5996ce8a066 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 20 Sep 2013 13:59:51 +0200
Subject: [PATCH 43/51] allow to order products on category page

---
 templates/default/assets/js/script.js         |  4 +
 templates/default/category.html               | 89 ++-----------------
 .../default/includes/categories-filters.html  | 77 ++++++++++++++++
 .../default/includes/category-toolbar.html    | 63 ++++++++-----
 .../default/includes/single-product.html      | 13 ++-
 templates/default/index.html                  | 57 +-----------
 6 files changed, 136 insertions(+), 167 deletions(-)
 create mode 100644 templates/default/includes/categories-filters.html

diff --git a/templates/default/assets/js/script.js b/templates/default/assets/js/script.js
index 2bbba577f..d115d2c5d 100644
--- a/templates/default/assets/js/script.js
+++ b/templates/default/assets/js/script.js
@@ -130,6 +130,10 @@
             window.location = $(this).val()
         });
 
+        $('#sortby-top').change(function(e){
+            window.location = $(this).val()
+        });
+
     });
 
 })(jQuery);
diff --git a/templates/default/category.html b/templates/default/category.html
index 5c1516f45..99db32948 100644
--- a/templates/default/category.html
+++ b/templates/default/category.html
@@ -21,16 +21,15 @@
 {block name="main-content"}
     <div class="main layout-col-2-left">
         {$limit={$smarty.get.limit|default:8}}
+        {$product_page={$smarty.get.page|default:1}}
+        {$product_order={$smarty.get.order|default:'alpha'}}
         <article class="col-main {$smarty.get.mode|default:"grid"}" role="main">
-            {include file="includes/category-toolbar.html" toolbar="top" limit=$limit}
+            {include file="includes/category-toolbar.html" toolbar="top" limit=$limit order=$product_order}
             <div id="category-products">
                 <div class="products-content">
                     <ul class="product-col-4">
-                        {loop type="product" name="product_list" category={category attr="id"} limit=$limit}
-
-                        <li class="item">
-                            {include file="includes/single-product.html" product_id=$ID}
-                        </li>
+                        {loop type="product" name="product_list" category={category attr="id"} limit=$limit page=$product_page order=$product_order}
+                            {include file="includes/single-product.html" product_id=$ID hasBtn=true hasDescription=true width="218" height="146"}
                         {/loop}
                     </ul>
                 </div>
@@ -42,83 +41,7 @@
 
             {include file="includes/menu.html"}
 
-            <section id="filters">
-                <h3>Find <span>a product</span></h3>
-                <form id="form-filters" action="" method="get" role="form">
-                    <div class="filter filter-type">
-                        <fieldset>
-                            <legend class="filter-heading">Type</legend>
-                            <div class="filter-content">
-                                <div class="checkbox">
-                                    <label for="type0">
-                                        <input type="checkbox" name="type0" id="type0" value="0"> Type 0
-                                    </label>
-                                </div>
-                                <div class="checkbox">
-                                    <label for="type1">
-                                        <input type="checkbox" name="type1" id="type1" value="1"> Type 1
-                                    </label>
-                                </div>
-                                <div class="checkbox">
-                                    <label for="type2">
-                                        <input type="checkbox" name="type2" id="type2" value="2"> Type 2
-                                    </label>
-                                </div>
-                            </div>
-                        </fieldset>
-                    </div><!-- /Filter Type -->
-
-                    <div class="filter filter-price">
-                        <fieldset>
-                            <legend class="filter-heading">Price</legend>
-                            <div class="filter-content">
-                                <div class="checkbox">
-                                    <label for="price0">
-                                        <input type="checkbox" name="price0" id="price0" value="0"> $0.00 - $99.99
-                                    </label>
-                                </div>
-                                <div class="checkbox">
-                                    <label for="price1">
-                                        <input type="checkbox" name="price1" id="price1" value="1"> $100.00 - $199.99
-                                    </label>
-                                </div>
-                                <div class="checkbox">
-                                    <label for="price2">
-                                        <input type="checkbox" name="price2" id="price2" value="2"> $200.00 and above
-                                    </label>
-                                </div>
-                            </div>
-                        </fieldset>
-                    </div><!-- /Filter Price -->
-
-                    <div class="filter filter-size">
-                        <fieldset>
-                            <legend class="filter-heading">Size</legend>
-                            <div class="filter-content">
-                                <div class="checkbox">
-                                    <label for="size0">
-                                        <input type="checkbox" name="size0" id="size0" value="0"> Large
-                                    </label>
-                                </div>
-                                <div class="checkbox">
-                                    <label for="size1">
-                                        <input type="checkbox" name="size1" id="size1" value="1"> Medium
-                                    </label>
-                                </div>
-                                <div class="checkbox">
-                                    <label for="size2">
-                                        <input type="checkbox" name="size2" id="size2" value="2"> Small
-                                    </label>
-                                </div>
-                            </div>
-                        </fieldset>
-                    </div><!-- /Filter Size -->
-
-                    <div class="group-btn">
-                        <button type="submit" class="btn btn-filter">Submit</button>
-                    </div>
-                </form>
-            </section><!-- /.filters -->
+            {include file="includes/categories-filters.html"}
 
         </aside>
 
diff --git a/templates/default/includes/categories-filters.html b/templates/default/includes/categories-filters.html
new file mode 100644
index 000000000..6a9425a66
--- /dev/null
+++ b/templates/default/includes/categories-filters.html
@@ -0,0 +1,77 @@
+<section id="filters">
+    <h3>Find <span>a product</span></h3>
+    <form id="form-filters" action="" method="get" role="form">
+        <div class="filter filter-type">
+            <fieldset>
+                <legend class="filter-heading">Type</legend>
+                <div class="filter-content">
+                    <div class="checkbox">
+                        <label for="type0">
+                            <input type="checkbox" name="type0" id="type0" value="0"> Type 0
+                        </label>
+                    </div>
+                    <div class="checkbox">
+                        <label for="type1">
+                            <input type="checkbox" name="type1" id="type1" value="1"> Type 1
+                        </label>
+                    </div>
+                    <div class="checkbox">
+                        <label for="type2">
+                            <input type="checkbox" name="type2" id="type2" value="2"> Type 2
+                        </label>
+                    </div>
+                </div>
+            </fieldset>
+        </div><!-- /Filter Type -->
+
+        <div class="filter filter-price">
+            <fieldset>
+                <legend class="filter-heading">Price</legend>
+                <div class="filter-content">
+                    <div class="checkbox">
+                        <label for="price0">
+                            <input type="checkbox" name="price0" id="price0" value="0"> $0.00 - $99.99
+                        </label>
+                    </div>
+                    <div class="checkbox">
+                        <label for="price1">
+                            <input type="checkbox" name="price1" id="price1" value="1"> $100.00 - $199.99
+                        </label>
+                    </div>
+                    <div class="checkbox">
+                        <label for="price2">
+                            <input type="checkbox" name="price2" id="price2" value="2"> $200.00 and above
+                        </label>
+                    </div>
+                </div>
+            </fieldset>
+        </div><!-- /Filter Price -->
+
+        <div class="filter filter-size">
+            <fieldset>
+                <legend class="filter-heading">Size</legend>
+                <div class="filter-content">
+                    <div class="checkbox">
+                        <label for="size0">
+                            <input type="checkbox" name="size0" id="size0" value="0"> Large
+                        </label>
+                    </div>
+                    <div class="checkbox">
+                        <label for="size1">
+                            <input type="checkbox" name="size1" id="size1" value="1"> Medium
+                        </label>
+                    </div>
+                    <div class="checkbox">
+                        <label for="size2">
+                            <input type="checkbox" name="size2" id="size2" value="2"> Small
+                        </label>
+                    </div>
+                </div>
+            </fieldset>
+        </div><!-- /Filter Size -->
+
+        <div class="group-btn">
+            <button type="submit" class="btn btn-filter">Submit</button>
+        </div>
+    </form>
+</section><!-- /.filters -->
\ No newline at end of file
diff --git a/templates/default/includes/category-toolbar.html b/templates/default/includes/category-toolbar.html
index 8268d6393..99583a02d 100644
--- a/templates/default/includes/category-toolbar.html
+++ b/templates/default/includes/category-toolbar.html
@@ -1,30 +1,30 @@
 <div class="toolbar toolbar-{$toolbar}" role="toolbar">
+    {if $toolbar == "top" }
     <div class="sorter-container">
         <span class="amount">9 Item(s)</span>
 
             <span class="limiter">
                 <label for="limit-top">Show</label>
                 <select id="limit-top" name="limit">
-                    <option value="{url path="{navigate to="current"}" limit="4"}" {if $limit==4}selected{/if}>4</option>
-                    <option value="{url path="{navigate to="current"}" limit="8"}" {if $limit==8}selected{/if}>8</option>
-                    <option value="{url path="{navigate to="current"}" limit="12"}" {if $limit==12}selected{/if}>12</option>
-                    <option value="{url path="{navigate to="current"}" limit="50"}"{if $limit==50}selected{/if}>50</option>
-                    <option value="{url path="{navigate to="current"}" limit="9999999999"}" {if $limit==9999999999}selected{/if}>All</option>
+                    <option value="{url path="{category attr="url"}" limit="4"}" {if $limit==4}selected{/if}>4</option>
+                    <option value="{url path="{category attr="url"}" limit="8"}" {if $limit==8}selected{/if}>8</option>
+                    <option value="{url path="{category attr="url"}" limit="12"}" {if $limit==12}selected{/if}>12</option>
+                    <option value="{url path="{category attr="url"}" limit="50"}"{if $limit==50}selected{/if}>50</option>
+                    <option value="{url path="{category attr="url"}" limit="9999999999"}" {if $limit==9999999999}selected{/if}>All</option>
                 </select>
                 <span class="per-page"> per page</span>
             </span><!-- /.limiter -->
 
             <span class="sort-by">
-                <label for="sortby-top">Sort By</label>
-                <select id="sortby-top" name="sortby" onchange="">
-                    <option value="?order=position">Position</option>
-                    <option value="?order=name" selected>Name</option>
-                    <option value="?order=price">Price</option>
-                    <option value="?order=rating">Rating</option>
+                <label for="sortby-top">{intl l="Sort By"}</label>
+                <select id="sortby-top" name="sortby">
+                    {*<option value="{url path="{category attr="url"}" order="manual"}">{intl l="Position"}</option>*}
+                    <option value="{url path="{category attr="url"}" limit=$limit order="alpha"}" {if $order=="alpha"}selected{/if}>{intl l="Name ascending"}</option>
+                    <option value="{url path="{category attr="url"}" limit=$limit order="alpha_reverse"}" {if $order=="alpha_reverse"}selected{/if}>{intl l="Name descending"}</option>
+                    <option value="{url path="{category attr="url"}" limit=$limit order="min_price"}" {if $order=="min_price"}selected{/if}>{intl l="Price ascending"}</option>
+                    <option value="{url path="{category attr="url"}" limit=$limit order="max_price"}" {if $order=="max_price"}selected{/if}>{intl l="Price descending"}</option>
+                    {*<option value="{url path="{category attr="url"}" order="rating"}">{intl l="Rating"}</option>*}
                 </select>
-
-                <a class="sort-order" href="?dir=desc" title="Set Descending Direction"><i class="icon-long-arrow-up"></i></a>
-
             </span><!-- /.sort-by -->
 
             <span class="view-mode">
@@ -36,17 +36,32 @@
             </span><!-- /.view-mode -->
 
     </div><!-- /.sorter -->
-
-    <div class="pagination-container" role="pagination" aria-labelledby="pagination-label-{$toolbar}">
-        <strong id="pagination-label-{$toolbar}" class="pagination-label">{intl l="Pagination"}</strong>
+    {else}
+    <div class="pagination-container" role="pagination" aria-labelledby="pagination-label-{$toolbar}}">
+        <strong id="pagination-label-{$toolbar}}" class="pagination-label">{intl l="Pagination"}</strong>
         <ul class="pagination">
-            <li><a href="?page=<?php echo $page-1; ?>" class="prev"><i class="icon-prev"></i></a></li>
-            <li class="active"><a href="?page=1" tabindex="-1"'; >1</a></li>
-            <li><a href="?page=2">2</a></li>
-            <li><a href="?page=3">3</a></li>
-            <li><a href="?page=4">4</a></li>
-            <li><a href="?page=5">5</a></li>
-            <li><a href="?page=<?php echo $page+1; ?>" class="next"><i class="icon-next"></i></a></li>
+
+            {if $product_page > 1}
+                <li><a href="{url path={navigate to="current"} page={$product_page-1} }" class="prev"><i class="icon-prev"></i></a></li>
+            {else}
+                <li><a href="#" class="prev"><i class="icon-prev"></i></a></li>
+            {/if}
+            {pageloop rel="product_list"}
+            {if $PAGE != $CURRENT}
+                <li><a href="{url path={navigate to="current"} page=$PAGE }"> {$PAGE} </a></li>
+            {else}
+                <li class="active"><a href="#" tabindex="-1">{$PAGE}</a></li>
+            {/if}
+            {if $PAGE == $LAST}
+                {if $CURRENT < $LAST}
+                    <li><a href="{url path={navigate to="current"} page={$CURRENT+1} }" class="next"><i class="icon-next"></i></a></li>
+                {else}
+                    <li><a href="#" class="next"><i class="icon-next"></i></a></li>
+                {/if}
+
+            {/if}
+            {/pageloop}
         </ul>
     </div>
+    {/if}
 </div><!-- /.toolbar toolbar-<?php echo $toolbar; ?> -->
diff --git a/templates/default/includes/single-product.html b/templates/default/includes/single-product.html
index 40b9d326b..bca37f80b 100644
--- a/templates/default/includes/single-product.html
+++ b/templates/default/includes/single-product.html
@@ -1,3 +1,4 @@
+<li class="item">
 <article itemscope itemtype="http://schema.org/Product">
     <!-- Use the meta tag to specify content that is not visible on the page in any way -->
     {loop name="brand.feature" type="feature" product=$ID title="brand"}
@@ -12,21 +13,22 @@
     {/loop}
 
     <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
-        {loop name="product_thumbnail" type="image" product=$ID width="218" height="146" resize_mode="borders" limit="1"}
+        {loop name="product_thumbnail" type="image" product=$ID width="{$width}" height="{$height}" resize_mode="borders" limit="1"}
             <img itemprop="image" src="{$IMAGE_URL}" alt="Product #{$LOOP_COUNT}">
         {/loop}
         {elseloop rel="product_thumbnail"}
-            {images file='../assets/img/218x146.png'}<img itemprop="image" src="{$asset_url}" alt="Product #{$LOOP_COUNT}">{/images}
+            {images file="../assets/img/{$width}x{$height}.png"}<img itemprop="image" src="{$asset_url}" alt="Product #{$LOOP_COUNT}">{/images}
         {/elseloop}
         <span class="mask"></span>
     </a>
 
     <div class="product-info">
         <h3 class="name"><a href="{$URL}"><span itemprop="name">{$TITLE}</span></a></h3>
-
+        {if $hasDescription}
         <div class="description" itemprop="description">
             <p>{$DESCRIPTION}</p>
         </div>
+        {/if}
     </div>
 
     <div class="product-price">
@@ -53,8 +55,11 @@
             {/if}
 
         </div>
+        {if $hasBtn}
         <div class="product-btn">
             <button class="btn btn-cart">Add to cart</button>
         </div>
+        {/if}
     </div>
-</article><!-- /product -->
\ No newline at end of file
+</article><!-- /product -->
+</li>
\ No newline at end of file
diff --git a/templates/default/index.html b/templates/default/index.html
index 674892ce9..390f06965 100644
--- a/templates/default/index.html
+++ b/templates/default/index.html
@@ -100,62 +100,7 @@
         <div class="products-content">
             <ul class="products-grid product-col-5 hover-effect">
                 {loop name="product_promo" type="product" limit="5" promo="yes"}
-                <li class="item">
-                    <article itemscope itemtype="http://schema.org/Product">
-                        <!-- Use the meta tag to specify content that is not visible on the page in any way -->
-                        {$product_id=$ID}
-                        {loop name="brand.feature" type="feature" product="{$ID}" title="brand"}
-                            {loop name="brand.value" type="feature_value" feature="{$ID}" product="$product_id"}
-                                <meta itemprop="brand" content="{$TITLE}">
-                            {/loop}
-                        {/loop}
-                        {loop name="brand.feature" type="feature" product=$ID title="isbn"}
-                            {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
-                                <meta itemprop="productID" content="isbn:{$TITLE}">
-                            {/loop}
-                        {/loop}
-
-                        <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
-                            {ifloop rel="image_product_promo" }
-                            <img itemprop="image"
-                                    {loop name="image_product_promo" type="image" limit="1" product="{$ID}" width="218" height="146" resize_mode="borders"}
-                                        src="{$IMAGE_URL}"
-                                    {/loop}
-                                 alt="Product #{$LOOP_COUNT}" >
-                            {/ifloop}
-                            {elseloop rel="image_product_promo"}
-                                {images file='assets/img/218x146.png'}<img itemprop="image" src="{$asset_url}" alt="Promotion #{$LOOP_COUNT}">{/images}
-                            {/elseloop}
-                            <span class="mask"></span>
-                        </a>
-
-                        <div class="product-info">
-                            <h3 class="name"><a href="{$URL}"><span itemprop="name">{$CHAPO}</span></a></h3>
-                        </div>
-
-                        <div class="product-price">
-                            <div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-                                {loop type="category" name="category_tag" id=$DEFAULT_CATEGORY}
-                                <meta itemprop="category" content="{$TITLE}">
-                                {/loop}
-                                <meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition"> <!-- List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition -->
-                                <meta itemprop="priceCurrency" content="{currency attr="code"}"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
-                                <link itemprop="availability" href="http://schema.org/InStock" content="in_stock" />
-                                <!-- List of availibility :
-                                    out_of_stock : http://schema.org/OutOfStock
-                                    in_stock : http://schema.org/InStock
-                                    instore_only : http://schema.org/InStoreOnly
-                                    preorder : http://schema.org/PreOrder
-                                    online_only : http://schema.org/OnlineOnly
-                                -->
-                                {loop name="productSaleElements_promo" type="product_sale_elements" product="{$ID}" limit="1"}
-                                    <span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number="{$TAXED_PROMO_PRICE}"} {currency attr="symbol"}</span></span>
-                                    <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number="{$TAXED_PRICE}"} {currency attr="symbol"}</span></span>
-                                {/loop}
-                            </div>
-                        </div>
-                    </article><!-- /product -->
-                </li>
+                    {include file="includes/single-product.html" product_id=$ID hasBtn=false hasDescription=false width="218" height="146"}
                 {/loop}
 
             </ul>

From 1649e4d76b5e120e80ad90579c46d4381375c5c2 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 20 Sep 2013 14:26:36 +0200
Subject: [PATCH 44/51] fix query in Thelia\Model\Folder::countAllContents

---
 core/lib/Thelia/Model/Folder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/lib/Thelia/Model/Folder.php b/core/lib/Thelia/Model/Folder.php
index 8cbe00ce0..128c5932a 100755
--- a/core/lib/Thelia/Model/Folder.php
+++ b/core/lib/Thelia/Model/Folder.php
@@ -44,8 +44,8 @@ class Folder extends BaseFolder
 
         foreach($children as $child)
         {
-            $contentsCount += ProductQuery::create()
-                ->filterByCategory($child)
+            $contentsCount += ContentQuery::create()
+                ->filterByFolder($child)
                 ->count();
         }
 

From 2cf71f99a90c3dae389fd486fcdf997f49f9749a Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 20 Sep 2013 14:38:11 +0200
Subject: [PATCH 45/51] change some informations in layou

---
 templates/default/layout.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl
index 7834bc706..37cbad224 100644
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -314,10 +314,10 @@ URL: http://www.thelia.net
                                     </address>
                                 </li>
                                 <li class="contact-phone">
-                                    <span class="tel" itemprop="telephone">+33 09 08 07 06 05</span>
+                                    <span class="tel" itemprop="telephone">+33 04 44 05 31 00</span>
                                 </li>
                                 <li class="contact-email">
-                                    <a href="mailto:demo@thelia.net" class="email" itemprop="email">demo@thelia.net</a>
+                                    <a href="mailto:demo@thelia.net" class="email" itemprop="email">info@thelia.net</a>
                                 </li>
                             </ul>
                         </div>

From 854149930259ab6fcea3d253f03152233d8f5a33 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Fri, 20 Sep 2013 16:25:46 +0200
Subject: [PATCH 46/51] order process

---
 core/lib/Thelia/Action/Order.php              |  89 ++++--------
 core/lib/Thelia/Config/Resources/config.xml   |   1 +
 .../Thelia/Config/Resources/routing/front.xml |   6 +-
 .../Controller/Front/OrderController.php      |  33 +++++
 core/lib/Thelia/Core/Event/OrderEvent.php     |  17 +++
 core/lib/Thelia/Core/Template/Loop/Cart.php   |  10 +-
 core/lib/Thelia/Core/Template/Loop/Module.php | 137 ++++++++++++++++++
 core/lib/Thelia/Core/Template/Loop/Order.php  |  91 +++++++++++-
 core/lib/Thelia/Exception/OrderException.php  |   3 -
 .../Thelia/Exception/TaxEngineException.php   |   1 +
 .../Exception/TheliaProcessException.php      |  54 +++++++
 core/lib/Thelia/Model/Order.php               |  26 +++-
 core/lib/Thelia/Model/OrderQuery.php          |  39 ++++-
 core/lib/Thelia/Model/TaxRule.php             |  20 ++-
 core/lib/Thelia/Model/TaxRuleQuery.php        |  10 +-
 core/lib/Thelia/Module/BaseModule.php         |  23 +++
 core/lib/Thelia/TaxEngine/Calculator.php      |  54 ++++++-
 .../TaxEngine/OrderProductTaxCollection.php   | 126 ++++++++++++++++
 .../Thelia/Tests/TaxEngine/CalculatorTest.php |   2 +-
 core/lib/Thelia/Tools/I18n.php                |  37 +++++
 install/insert.sql                            |   4 +-
 local/modules/Cheque/Cheque.php               |   9 ++
 local/modules/FakeCB/FakeCB.php               |   9 ++
 .../{order_payment.html => order_placed.html} |  12 +-
 24 files changed, 718 insertions(+), 95 deletions(-)
 create mode 100755 core/lib/Thelia/Core/Template/Loop/Module.php
 create mode 100755 core/lib/Thelia/Exception/TheliaProcessException.php
 create mode 100755 core/lib/Thelia/TaxEngine/OrderProductTaxCollection.php
 rename templates/default/{order_payment.html => order_placed.html} (85%)

diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php
index 17d8327c0..3b1ceb5da 100755
--- a/core/lib/Thelia/Action/Order.php
+++ b/core/lib/Thelia/Action/Order.php
@@ -24,20 +24,14 @@
 namespace Thelia\Action;
 
 use Propel\Runtime\ActiveQuery\ModelCriteria;
-use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Thelia\Core\Event\OrderEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Exception\OrderException;
-use Thelia\Model\AttributeAvI18n;
-use Thelia\Model\AttributeAvI18nQuery;
-use Thelia\Model\AttributeI18n;
-use Thelia\Model\AttributeI18nQuery;
+use Thelia\Exception\TheliaProcessException;
 use Thelia\Model\AddressQuery;
 use Thelia\Model\OrderProductAttributeCombination;
-use Thelia\Model\ProductI18nQuery;
-use Thelia\Model\Lang;
 use Thelia\Model\ModuleQuery;
 use Thelia\Model\OrderProduct;
 use Thelia\Model\OrderStatus;
@@ -45,7 +39,7 @@ use Thelia\Model\Map\OrderTableMap;
 use Thelia\Model\OrderAddress;
 use Thelia\Model\OrderStatusQuery;
 use Thelia\Model\ConfigQuery;
-use Thelia\Model\ProductI18n;
+use Thelia\Tools\I18n;
 
 /**
  *
@@ -125,6 +119,7 @@ class Order extends BaseAction implements EventSubscriberInterface
         $currency = $this->getSession()->getCurrency();
         $lang = $this->getSession()->getLang();
         $deliveryAddress = AddressQuery::create()->findPk($sessionOrder->chosenDeliveryAddress);
+        $taxCountry = $deliveryAddress->getCountry();
         $invoiceAddress = AddressQuery::create()->findPk($sessionOrder->chosenInvoiceAddress);
         $cart = $this->getSession()->getCart();
         $cartItems = $cart->getCartItems();
@@ -182,23 +177,30 @@ class Order extends BaseAction implements EventSubscriberInterface
         foreach($cartItems as $cartItem) {
             $product = $cartItem->getProduct();
 
-            /* get customer translation */
-            $productI18n = $this->getI18n(ProductI18nQuery::create(), new ProductI18n(), $product->getId());
+            /* get translation */
+            $productI18n = I18n::forceI18nRetrieving($this->getSession()->getLang()->getLocale(), 'Product', $product->getId());
 
             $pse = $cartItem->getProductSaleElements();
 
             /* check still in stock */
             if($cartItem->getQuantity() > $pse->getQuantity()) {
-                $e = new OrderException("Not enough stock", OrderException::NOT_ENOUGH_STOCK);
-                $e->cartItem = $cartItem;
-                throw $e;
+                throw new TheliaProcessException("Not enough stock", TheliaProcessException::CART_ITEM_NOT_ENOUGH_STOCK, $cartItem);
             }
 
             /* decrease stock */
             $pse->setQuantity(
                 $pse->getQuantity() - $cartItem->getQuantity()
             );
-            $pse->save();
+            $pse->save($con);
+
+            /* get tax */
+            $taxRuleI18n = I18n::forceI18nRetrieving($this->getSession()->getLang()->getLocale(), 'TaxRule', $product->getTaxRuleId());
+
+            $taxDetail = $product->getTaxRule()->getTaxDetail(
+                $taxCountry,
+                $cartItem->getPromo() == 1 ? $cartItem->getPromoPrice() : $cartItem->getPrice(),
+                $this->getSession()->getLang()->getLocale()
+            );
 
             $orderProduct = new OrderProduct();
             $orderProduct
@@ -215,14 +217,22 @@ class Order extends BaseAction implements EventSubscriberInterface
                 ->setWasNew($pse->getNewness())
                 ->setWasInPromo($cartItem->getPromo())
                 ->setWeight($pse->getWeight())
+                ->setTaxRuleTitle($taxRuleI18n->getTitle())
+                ->setTaxRuleDescription($taxRuleI18n->getDescription())
             ;
             $orderProduct->setDispatcher($this->getDispatcher());
-            $orderProduct->save();
+            $orderProduct->save($con);
+
+            /* fulfill order_product_tax */
+            foreach($taxDetail as $tax) {
+                $tax->setOrderProductId($orderProduct->getId());
+                $tax->save($con);
+            }
 
             /* fulfill order_attribute_combination and decrease stock */
             foreach($pse->getAttributeCombinations() as $attributeCombination) {
-                $attribute = $this->getI18n(AttributeI18nQuery::create(), new AttributeI18n(), $attributeCombination->getAttributeId());
-                $attributeAv = $this->getI18n(AttributeAvI18nQuery::create(), new AttributeAvI18n(), $attributeCombination->getAttributeAvId());
+                $attribute = I18n::forceI18nRetrieving($this->getSession()->getLang()->getLocale(), 'Attribute', $attributeCombination->getAttributeId());
+                $attributeAv = I18n::forceI18nRetrieving($this->getSession()->getLang()->getLocale(), 'AttributeAv', $attributeCombination->getAttributeAvId());
 
                 $orderAttributeCombination = new OrderProductAttributeCombination();
                 $orderAttributeCombination
@@ -237,7 +247,7 @@ class Order extends BaseAction implements EventSubscriberInterface
                     ->setAttributeAvPostscriptum($attributeAv->getPostscriptum())
                 ;
 
-                $orderAttributeCombination->save();
+                $orderAttributeCombination->save($con);
             }
         }
 
@@ -248,12 +258,13 @@ class Order extends BaseAction implements EventSubscriberInterface
         $this->getDispatcher()->dispatch(TheliaEvents::ORDER_BEFORE_PAYMENT, new OrderEvent($placedOrder));
 
         /* clear session */
+        /* but memorize placed order */
         $sessionOrder = new \Thelia\Model\Order();
         $event->setOrder($sessionOrder);
+        $event->setPlacedOrder($placedOrder);
         $this->getSession()->setOrder($sessionOrder);
 
-        /* empty cart */
-        $this->getSession()->getCart()->clear();
+        /* empty cart @todo */
 
         /* call pay method */
         $paymentModuleReflection = new \ReflectionClass($paymentModule->getFullNamespace());
@@ -349,42 +360,4 @@ class Order extends BaseAction implements EventSubscriberInterface
 
         return $request->getSession();
     }
-
-    /**
-     * @param ModelCriteria         $query
-     * @param ActiveRecordInterface $object
-     * @param                       $id
-     * @param array                 $needed = array('Title')
-     *
-     * @return ProductI18n
-     */
-    protected function getI18n(ModelCriteria $query, ActiveRecordInterface $object, $id, $needed = array('Title'))
-    {
-        $i18n = $query
-            ->filterById($id)
-            ->filterByLocale(
-                $this->getSession()->getLang()->getLocale()
-            )->findOne();
-        /* or default translation */
-        if(null === $i18n) {
-            $i18n = $query
-                ->filterById($id)
-                ->filterByLocale(
-                    Lang::getDefaultLanguage()->getLocale()
-                )->findOne();
-        }
-        if(null === $i18n) { // @todo something else ?
-            $i18n = $object;
-            foreach($needed as $need) {
-                $method = sprintf('get%s', $need);
-                if(method_exists($i18n, $method)) {
-                    $i18n->$method('DEFAULT ' . strtoupper($need));
-                } else {
-                    // @todo throw sg ?
-                }
-            }
-        }
-
-        return $i18n;
-    }
 }
diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 43e48f6e4..329ed609d 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -21,6 +21,7 @@
         <loop class="Thelia\Core\Template\Loop\FeatureAvailability" name="feature_availability"/>
         <loop class="Thelia\Core\Template\Loop\FeatureValue" name="feature_value"/>
         <loop class="Thelia\Core\Template\Loop\Folder" name="folder"/>
+        <loop class="Thelia\Core\Template\Loop\Module" name="module"/>
         <loop class="Thelia\Core\Template\Loop\Order" name="order"/>
         <loop class="Thelia\Core\Template\Loop\OrderStatus" name="order-status"/>
         <loop class="Thelia\Core\Template\Loop\CategoryPath" name="category-path"/>
diff --git a/core/lib/Thelia/Config/Resources/routing/front.xml b/core/lib/Thelia/Config/Resources/routing/front.xml
index f254a817e..5b26a6ed6 100755
--- a/core/lib/Thelia/Config/Resources/routing/front.xml
+++ b/core/lib/Thelia/Config/Resources/routing/front.xml
@@ -137,7 +137,11 @@
 
     <route id="order.payment.process" path="/order/pay">
         <default key="_controller">Thelia\Controller\Front\OrderController::pay</default>
-        <default key="_view">order_payment</default>
+    </route>
+
+    <route id="order.placed" path="/order/placed/{order_id}">
+        <default key="_controller">Thelia\Controller\Front\OrderController::orderPlaced</default>
+        <default key="_view">order_placed</default>
     </route>
     <!-- end order management process -->
 
diff --git a/core/lib/Thelia/Controller/Front/OrderController.php b/core/lib/Thelia/Controller/Front/OrderController.php
index 4dd678a82..1f2c716ae 100755
--- a/core/lib/Thelia/Controller/Front/OrderController.php
+++ b/core/lib/Thelia/Controller/Front/OrderController.php
@@ -23,6 +23,7 @@
 namespace Thelia\Controller\Front;
 
 use Propel\Runtime\Exception\PropelException;
+use Thelia\Exception\TheliaProcessException;
 use Thelia\Form\Exception\FormValidationException;
 use Thelia\Core\Event\OrderEvent;
 use Thelia\Core\Event\TheliaEvents;
@@ -32,9 +33,11 @@ use Thelia\Form\OrderPayment;
 use Thelia\Log\Tlog;
 use Thelia\Model\AddressQuery;
 use Thelia\Model\AreaDeliveryModuleQuery;
+use Thelia\Model\Base\OrderQuery;
 use Thelia\Model\CountryQuery;
 use Thelia\Model\ModuleQuery;
 use Thelia\Model\Order;
+use Thelia\Tools\URL;
 
 /**
  * Class OrderController
@@ -187,6 +190,36 @@ class OrderController extends BaseFrontController
         $orderEvent = $this->getOrderEvent();
 
         $this->getDispatcher()->dispatch(TheliaEvents::ORDER_PAY, $orderEvent);
+
+        $placedOrder = $orderEvent->getPlacedOrder();
+
+        if(null !== $placedOrder && null !== $placedOrder->getId()) {
+            /* order has been placed */
+            $this->redirect(URL::getInstance()->absoluteUrl($this->getRoute('order.placed', array('order_id' => $orderEvent->getPlacedOrder()->getId()))));
+        } else {
+            /* order has not been placed */
+            $this->redirectToRoute("cart.view");
+        }
+    }
+
+    public function orderPlaced($order_id)
+    {
+        /* check if the placed order matched the customer */
+        $placedOrder = OrderQuery::create()->findPk(
+            $this->getRequest()->attributes->get('order_id')
+        );
+
+        if(null === $placedOrder) {
+            throw new TheliaProcessException("No placed order", TheliaProcessException::NO_PLACED_ORDER, $placedOrder);
+        }
+
+        $customer = $this->getSecurityContext()->getCustomerUser();
+
+        if(null === $customer || $placedOrder->getCustomerId() !== $customer->getId()) {
+            throw new TheliaProcessException("Received placed order id does not belong to the current customer", TheliaProcessException::PLACED_ORDER_ID_BAD_CURRENT_CUSTOMER, $placedOrder);
+        }
+
+        $this->getParserContext()->set("placed_order_id", $placedOrder->getId());
     }
 
     protected function getOrderEvent()
diff --git a/core/lib/Thelia/Core/Event/OrderEvent.php b/core/lib/Thelia/Core/Event/OrderEvent.php
index a156b753f..7089141bb 100755
--- a/core/lib/Thelia/Core/Event/OrderEvent.php
+++ b/core/lib/Thelia/Core/Event/OrderEvent.php
@@ -28,6 +28,7 @@ use Thelia\Model\Order;
 class OrderEvent extends ActionEvent
 {
     protected $order = null;
+    protected $placedOrder = null;
     protected $invoiceAddress = null;
     protected $deliveryAddress = null;
     protected $deliveryModule = null;
@@ -51,6 +52,14 @@ class OrderEvent extends ActionEvent
         $this->order = $order;
     }
 
+    /**
+     * @param Order $order
+     */
+    public function setPlacedOrder(Order $order)
+    {
+        $this->placedOrder = $order;
+    }
+
     /**
      * @param $address
      */
@@ -107,6 +116,14 @@ class OrderEvent extends ActionEvent
         return $this->order;
     }
 
+    /**
+     * @return null|Order
+     */
+    public function getPlacedOrder()
+    {
+        return $this->placedOrder;
+    }
+
     /**
      * @return null|int
      */
diff --git a/core/lib/Thelia/Core/Template/Loop/Cart.php b/core/lib/Thelia/Core/Template/Loop/Cart.php
index 16c108135..5c08b2896 100755
--- a/core/lib/Thelia/Core/Template/Loop/Cart.php
+++ b/core/lib/Thelia/Core/Template/Loop/Cart.php
@@ -81,6 +81,8 @@ class Cart extends BaseLoop
             return $result;
         }
 
+        $taxCountry = CountryQuery::create()->findPk(64); // @TODO : make it magic;
+
         foreach ($cartItems as $cartItem) {
             $product = $cartItem->getProduct();
             $productSaleElement = $cartItem->getProductSaleElements();
@@ -97,12 +99,8 @@ class Cart extends BaseLoop
                 ->set("STOCK", $productSaleElement->getQuantity())
                 ->set("PRICE", $cartItem->getPrice())
                 ->set("PROMO_PRICE", $cartItem->getPromoPrice())
-                ->set("TAXED_PRICE", $cartItem->getTaxedPrice(
-                    CountryQuery::create()->findOneById(64) // @TODO : make it magic
-                ))
-                ->set("PROMO_TAXED_PRICE", $cartItem->getTaxedPromoPrice(
-                    CountryQuery::create()->findOneById(64) // @TODO : make it magic
-                ))
+                ->set("TAXED_PRICE", $cartItem->getTaxedPrice($taxCountry))
+                ->set("PROMO_TAXED_PRICE", $cartItem->getTaxedPromoPrice($taxCountry))
                 ->set("IS_PROMO", $cartItem->getPromo() === 1 ? 1 : 0);
             $result->addRow($loopResultRow);
         }
diff --git a/core/lib/Thelia/Core/Template/Loop/Module.php b/core/lib/Thelia/Core/Template/Loop/Module.php
new file mode 100755
index 000000000..1c4f91b4d
--- /dev/null
+++ b/core/lib/Thelia/Core/Template/Loop/Module.php
@@ -0,0 +1,137 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Core\Template\Loop;
+
+use Propel\Runtime\ActiveQuery\Criteria;
+use Thelia\Core\Template\Element\BaseI18nLoop;
+use Thelia\Core\Template\Element\LoopResult;
+use Thelia\Core\Template\Element\LoopResultRow;
+
+use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
+use Thelia\Core\Template\Loop\Argument\Argument;
+
+use Thelia\Model\ModuleQuery;
+
+use Thelia\Module\BaseModule;
+use Thelia\Type;
+
+/**
+ *
+ * Module loop
+ *
+ *
+ * Class Module
+ * @package Thelia\Core\Template\Loop
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ */
+class Module extends BaseI18nLoop
+{
+    public $timestampable = true;
+
+    /**
+     * @return ArgumentCollection
+     */
+    protected function getArgDefinitions()
+    {
+        return new ArgumentCollection(
+            Argument::createIntListTypeArgument('id'),
+            new Argument(
+                'module_type',
+                new Type\TypeCollection(
+                    new Type\EnumListType(array(
+                        BaseModule::CLASSIC_MODULE_TYPE,
+                        BaseModule::DELIVERY_MODULE_TYPE,
+                        BaseModule::PAYMENT_MODULE_TYPE,
+                    ))
+                )
+            ),
+            Argument::createIntListTypeArgument('exclude'),
+            Argument::createBooleanOrBothTypeArgument('active', Type\BooleanOrBothType::ANY)
+        );
+    }
+
+    /**
+     * @param $pagination
+     *
+     * @return \Thelia\Core\Template\Element\LoopResult
+     */
+    public function exec(&$pagination)
+    {
+        $search = ModuleQuery::create();
+
+        /* manage translations */
+        $locale = $this->configureI18nProcessing($search);
+
+        $id = $this->getId();
+
+        if (null !== $id) {
+            $search->filterById($id, Criteria::IN);
+        }
+
+        $moduleType = $this->getModule_type();
+
+        if (null !== $moduleType) {
+            $search->filterByType($moduleType, Criteria::IN);
+        }
+
+        $exclude = $this->getExclude();
+
+        if (!is_null($exclude)) {
+            $search->filterById($exclude, Criteria::NOT_IN);
+        }
+
+        $active = $this->getActive();
+
+        if($active !== Type\BooleanOrBothType::ANY) {
+            $search->filterByActivate($active ? 1 : 0, Criteria::EQUAL);
+        }
+
+        $search->orderByPosition();
+
+        /* perform search */
+        $modules = $this->search($search, $pagination);
+
+        $loopResult = new LoopResult($modules);
+
+        foreach ($modules as $module) {
+            $loopResultRow = new LoopResultRow($loopResult, $module, $this->versionable, $this->timestampable, $this->countable);
+            $loopResultRow->set("ID", $module->getId())
+                ->set("IS_TRANSLATED",$module->getVirtualColumn('IS_TRANSLATED'))
+                ->set("LOCALE",$locale)
+                ->set("TITLE",$module->getVirtualColumn('i18n_TITLE'))
+                ->set("CHAPO", $module->getVirtualColumn('i18n_CHAPO'))
+                ->set("DESCRIPTION", $module->getVirtualColumn('i18n_DESCRIPTION'))
+                ->set("POSTSCRIPTUM", $module->getVirtualColumn('i18n_POSTSCRIPTUM'))
+                ->set("CODE", $module->getCode())
+                ->set("TYPE", $module->getType())
+                ->set("ACTIVE", $module->getActivate())
+                ->set("CLASS", $module->getFullNamespace())
+                ->set("POSITION", $module->getPosition());
+
+            $loopResult->addRow($loopResultRow);
+        }
+
+        return $loopResult;
+    }
+}
diff --git a/core/lib/Thelia/Core/Template/Loop/Order.php b/core/lib/Thelia/Core/Template/Loop/Order.php
index fd11d8d4c..41d49c4f8 100755
--- a/core/lib/Thelia/Core/Template/Loop/Order.php
+++ b/core/lib/Thelia/Core/Template/Loop/Order.php
@@ -23,12 +23,16 @@
 
 namespace Thelia\Core\Template\Loop;
 
+use Propel\Runtime\ActiveQuery\Criteria;
 use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
 
+use Thelia\Core\Template\Element\LoopResultRow;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-
+use Thelia\Model\OrderQuery;
+use Thelia\Type\TypeCollection;
+use Thelia\Type;
 /**
  *
  * @package Thelia\Core\Template\Loop
@@ -37,19 +41,94 @@ use Thelia\Core\Template\Loop\Argument\Argument;
  */
 class Order extends BaseLoop
 {
+    public $countable = true;
+    public $timestampable = true;
+    public $versionable = false;
+
     public function getArgDefinitions()
     {
-        return new ArgumentCollection();
+        return new ArgumentCollection(
+            Argument::createIntListTypeArgument('id'),
+            new Argument(
+                'customer',
+                new TypeCollection(
+                    new Type\IntType(),
+                    new Type\EnumType(array('current'))
+                ),
+                'current'
+            ),
+            Argument::createIntListTypeArgument('status')
+        );
     }
 
     /**
+     * @param $pagination
      *
-     *
-     * @return \Thelia\Core\Template\Element\LoopResult
+     * @return LoopResult
      */
     public function exec(&$pagination)
     {
-        // TODO : a coder !
-        return new LoopResult();
+        $search = OrderQuery::create();
+
+        $id = $this->getId();
+
+        if (null !== $id) {
+            $search->filterById($id, Criteria::IN);
+        }
+
+        $customer = $this->getCustomer();
+
+        if ($customer === 'current') {
+            $currentCustomer = $this->securityContext->getCustomerUser();
+            if ($currentCustomer === null) {
+                return new LoopResult();
+            } else {
+                $search->filterByCustomerId($currentCustomer->getId(), Criteria::EQUAL);
+            }
+        } else {
+            $search->filterByCustomerId($customer, Criteria::EQUAL);
+        }
+
+        $status = $this->getStatus();
+
+        if (null !== $status) {
+            $search->filterByStatusId($status, Criteria::IN);
+        }
+
+        $orders = $this->search($search, $pagination);
+
+        $loopResult = new LoopResult($orders);
+
+        foreach ($orders as $order) {
+            $tax = 0;
+            $amount = $order->getTotalAmount($tax);
+            $loopResultRow = new LoopResultRow($loopResult, $order, $this->versionable, $this->timestampable, $this->countable);
+            $loopResultRow
+                ->set("ID", $order->getId())
+                ->set("REF", $order->getRef())
+                ->set("CUSTOMER", $order->getCustomerId())
+                ->set("DELIVERY_ADDRESS", $order->getDeliveryOrderAddressId())
+                ->set("INVOICE_ADDRESS", $order->getInvoiceOrderAddressId())
+                ->set("INVOICE_DATE", $order->getInvoiceDate())
+                ->set("CURRENCY", $order->getCurrencyId())
+                ->set("CURRENCY_RATE", $order->getCurrencyRate())
+                ->set("TRANSACTION_REF", $order->getTransactionRef())
+                ->set("DELIVERY_REF", $order->getDeliveryRef())
+                ->set("INVOICE_REF", $order->getInvoiceRef())
+                ->set("POSTAGE", $order->getPostage())
+                ->set("PAYMENT_MODULE", $order->getPaymentModuleId())
+                ->set("DELIVERY_MODULE", $order->getDeliveryModuleId())
+                ->set("STATUS", $order->getStatusId())
+                ->set("LANG", $order->getLangId())
+                ->set("POSTAGE", $order->getPostage())
+                ->set("TOTAL_TAX", $tax)
+                ->set("TOTAL_AMOUNT", $amount - $tax)
+                ->set("TOTAL_TAXED_AMOUNT", $amount)
+            ;
+
+            $loopResult->addRow($loopResultRow);
+        }
+
+        return $loopResult;
     }
 }
diff --git a/core/lib/Thelia/Exception/OrderException.php b/core/lib/Thelia/Exception/OrderException.php
index 68eb36474..70fd21c01 100755
--- a/core/lib/Thelia/Exception/OrderException.php
+++ b/core/lib/Thelia/Exception/OrderException.php
@@ -30,7 +30,6 @@ class OrderException extends \RuntimeException
      */
     public $cartRoute = "cart.view";
     public $orderDeliveryRoute = "order.delivery";
-    public $cartItem = null;
 
     public $arguments = array();
 
@@ -40,8 +39,6 @@ class OrderException extends \RuntimeException
 
     const UNDEFINED_DELIVERY = 200;
 
-    const NOT_ENOUGH_STOCK = 300;
-
     public function __construct($message, $code = null, $arguments = array(), $previous = null)
     {
         if(is_array($arguments)) {
diff --git a/core/lib/Thelia/Exception/TaxEngineException.php b/core/lib/Thelia/Exception/TaxEngineException.php
index 93f5b8237..86f8952b9 100755
--- a/core/lib/Thelia/Exception/TaxEngineException.php
+++ b/core/lib/Thelia/Exception/TaxEngineException.php
@@ -39,6 +39,7 @@ class TaxEngineException extends \RuntimeException
     const UNDEFINED_TAX_RULES_COLLECTION = 503;
     const UNDEFINED_REQUIREMENTS = 504;
     const UNDEFINED_REQUIREMENT_VALUE = 505;
+    const UNDEFINED_TAX_RULE = 506;
 
     const BAD_AMOUNT_FORMAT = 601;
 
diff --git a/core/lib/Thelia/Exception/TheliaProcessException.php b/core/lib/Thelia/Exception/TheliaProcessException.php
new file mode 100755
index 000000000..f61224dea
--- /dev/null
+++ b/core/lib/Thelia/Exception/TheliaProcessException.php
@@ -0,0 +1,54 @@
+<?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\Exception;
+
+/**
+ * these exception are non fatal exception, due to thelia process exception
+ * or customer random navigation
+ *
+ * they redirect the customer who trig them to a specific error page // @todo
+ *
+ * Class TheliaProcessException
+ * @package Thelia\Exception
+ */
+class TheliaProcessException extends \RuntimeException
+{
+    public $data = null;
+
+    const UNKNOWN_EXCEPTION = 0;
+
+    const CART_ITEM_NOT_ENOUGH_STOCK = 100;
+    const NO_PLACED_ORDER = 101;
+    const PLACED_ORDER_ID_BAD_CURRENT_CUSTOMER = 102;
+
+    public function __construct($message, $code = null, $data = null, $previous = null)
+    {
+        $this->data = $data;
+
+        if ($code === null) {
+            $code = self::UNKNOWN_EXCEPTION;
+        }
+        parent::__construct($message, $code, $previous);
+    }
+}
diff --git a/core/lib/Thelia/Model/Order.php b/core/lib/Thelia/Model/Order.php
index f730c8853..5249a1366 100755
--- a/core/lib/Thelia/Model/Order.php
+++ b/core/lib/Thelia/Model/Order.php
@@ -2,11 +2,15 @@
 
 namespace Thelia\Model;
 
+use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Propel\Runtime\Propel;
 use Thelia\Core\Event\OrderEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Base\Order as BaseOrder;
+use Thelia\Model\Base\OrderProductTaxQuery;
+use Thelia\Model\Map\OrderProductTaxTableMap;
+use Thelia\Model\OrderProductQuery;
 use Thelia\Model\Map\OrderTableMap;
 use \PDO;
 
@@ -38,13 +42,27 @@ class Order extends BaseOrder
     /**
      * calculate the total amount
      *
-     * @TODO create body method
+     * @param int $tax
      *
-     * @return int
+     * @return int|string|Base\double
      */
-    public function getTotalAmount()
+    public function getTotalAmount(&$tax = 0)
     {
-        return 2;
+        $amount = 0;
+        $tax = 0;
+
+        /* browse all products */
+        $orderProductIds = array();
+        foreach($this->getOrderProducts() as $orderProduct) {
+            $taxAmount = OrderProductTaxQuery::create()
+                ->withColumn('SUM(' . OrderProductTaxTableMap::AMOUNT . ')', 'total_tax')
+                ->filterByOrderProductId($orderProduct->getId(), Criteria::EQUAL)
+                ->findOne();
+            $amount += ($orderProduct->getWasInPromo() == 1 ? $orderProduct->getPromoPrice() : $orderProduct->getPrice()) * $orderProduct->getQuantity();
+            $tax += round($taxAmount->getVirtualColumn('total_tax'), 2) * $orderProduct->getQuantity();
+        }
+
+        return $amount + $tax + $this->getPostage(); // @todo : manage discount
     }
 
     /**
diff --git a/core/lib/Thelia/Model/OrderQuery.php b/core/lib/Thelia/Model/OrderQuery.php
index 13cb1cbf1..8d5e4c085 100755
--- a/core/lib/Thelia/Model/OrderQuery.php
+++ b/core/lib/Thelia/Model/OrderQuery.php
@@ -2,8 +2,11 @@
 
 namespace Thelia\Model;
 
+use Propel\Runtime\Exception\PropelException;
+use Propel\Runtime\Propel;
 use Thelia\Model\Base\OrderQuery as BaseOrderQuery;
-
+use \PDO;
+use Thelia\Model\Map\OrderTableMap;
 
 /**
  * Skeleton subclass for performing query and update operations on the 'order' table.
@@ -15,6 +18,38 @@ use Thelia\Model\Base\OrderQuery as BaseOrderQuery;
  * long as it does not already exist in the output directory.
  *
  */
-class OrderQuery extends BaseOrderQuery {
+class OrderQuery extends BaseOrderQuery
+{
+    /**
+     * PROPEL SHOULD FIX IT
+     *
+     * Find object by primary key using raw SQL to go fast.
+     * Bypass doSelect() and the object formatter by using generated code.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     ConnectionInterface $con A connection object
+     *
+     * @return   Order A model object, or null if the key is not found
+     */
+    protected function findPkSimple($key, $con)
+    {
+        $sql = 'SELECT ID, REF, CUSTOMER_ID, INVOICE_ORDER_ADDRESS_ID, DELIVERY_ORDER_ADDRESS_ID, INVOICE_DATE, CURRENCY_ID, CURRENCY_RATE, TRANSACTION_REF, DELIVERY_REF, INVOICE_REF, POSTAGE, PAYMENT_MODULE_ID, DELIVERY_MODULE_ID, STATUS_ID, LANG_ID, CREATED_AT, UPDATED_AT FROM `order` WHERE ID = :p0';
+        try {
+            $stmt = $con->prepare($sql);
+            $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
+            $stmt->execute();
+        } catch (\Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
+        }
+        $obj = null;
+        if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
+            $obj = new Order();
+            $obj->hydrate($row);
+            OrderTableMap::addInstanceToPool($obj, (string) $key);
+        }
+        $stmt->closeCursor();
 
+        return $obj;
+    }
 } // OrderQuery
diff --git a/core/lib/Thelia/Model/TaxRule.php b/core/lib/Thelia/Model/TaxRule.php
index 36f80a044..024fd8923 100755
--- a/core/lib/Thelia/Model/TaxRule.php
+++ b/core/lib/Thelia/Model/TaxRule.php
@@ -3,7 +3,25 @@
 namespace Thelia\Model;
 
 use Thelia\Model\Base\TaxRule as BaseTaxRule;
+use Thelia\TaxEngine\Calculator;
+use Thelia\TaxEngine\OrderProductTaxCollection;
 
-class TaxRule extends BaseTaxRule {
+class TaxRule extends BaseTaxRule
+{
+    /**
+     * @param Country $country
+     * @param         $untaxedAmount
+     * @param null    $askedLocale
+     *
+     * @return OrderProductTaxCollection
+     */
+    public function getTaxDetail(Country $country, $untaxedAmount, $askedLocale = null)
+    {
+        $taxCalculator = new Calculator();
 
+        $taxCollection = new OrderProductTaxCollection();
+        $taxCalculator->loadTaxRule($this, $country)->getTaxedPrice($untaxedAmount, $taxCollection, $askedLocale);
+
+        return $taxCollection;
+    }
 }
diff --git a/core/lib/Thelia/Model/TaxRuleQuery.php b/core/lib/Thelia/Model/TaxRuleQuery.php
index d5ce47546..572500003 100755
--- a/core/lib/Thelia/Model/TaxRuleQuery.php
+++ b/core/lib/Thelia/Model/TaxRuleQuery.php
@@ -21,13 +21,19 @@ class TaxRuleQuery extends BaseTaxRuleQuery
 {
     const ALIAS_FOR_TAX_RULE_COUNTRY_POSITION = 'taxRuleCountryPosition';
 
-    public function getTaxCalculatorCollection(Product $product, Country $country)
+    /**
+     * @param TaxRule $taxRule
+     * @param Country $country
+     *
+     * @return array|mixed|\Propel\Runtime\Collection\ObjectCollection
+     */
+    public function getTaxCalculatorCollection(TaxRule $taxRule, Country $country)
     {
         $search = TaxQuery::create()
             ->filterByTaxRuleCountry(
                 TaxRuleCountryQuery::create()
                     ->filterByCountry($country, Criteria::EQUAL)
-                    ->filterByTaxRuleId($product->getTaxRuleId())
+                    ->filterByTaxRuleId($taxRule->getId())
                     ->orderByPosition()
                     ->find()
             )
diff --git a/core/lib/Thelia/Module/BaseModule.php b/core/lib/Thelia/Module/BaseModule.php
index f559c1fd5..8efc76e6e 100755
--- a/core/lib/Thelia/Module/BaseModule.php
+++ b/core/lib/Thelia/Module/BaseModule.php
@@ -25,7 +25,9 @@
 namespace Thelia\Module;
 
 use Symfony\Component\DependencyInjection\ContainerAware;
+use Thelia\Model\ModuleI18nQuery;
 use Thelia\Model\Map\ModuleImageTableMap;
+use Thelia\Model\ModuleI18n;
 use Thelia\Tools\Image;
 use Thelia\Exception\ModuleException;
 use Thelia\Model\Module;
@@ -76,6 +78,27 @@ abstract class BaseModule extends ContainerAware
         return $this->container;
     }
 
+    public function setTitle(Module $module, $titles)
+    {
+        if(is_array($titles)) {
+            foreach($titles as $locale => $title) {
+                $moduleI18n = ModuleI18nQuery::create()->filterById($module->getId())->filterByLocale($locale)->findOne();
+                if(null === $moduleI18n) {
+                    $moduleI18n = new ModuleI18n();
+                    $moduleI18n
+                        ->setId($module->getId())
+                        ->setLocale($locale)
+                        ->setTitle($title)
+                    ;
+                    $moduleI18n->save();
+                } else {
+                    $moduleI18n->setTitle($title);
+                    $moduleI18n->save();
+                }
+            }
+        }
+    }
+
     public function deployImageFolder(Module $module, $folderPath)
     {
         try {
diff --git a/core/lib/Thelia/TaxEngine/Calculator.php b/core/lib/Thelia/TaxEngine/Calculator.php
index b5a2f995e..8039dec39 100755
--- a/core/lib/Thelia/TaxEngine/Calculator.php
+++ b/core/lib/Thelia/TaxEngine/Calculator.php
@@ -24,8 +24,11 @@ namespace Thelia\TaxEngine;
 
 use Thelia\Exception\TaxEngineException;
 use Thelia\Model\Country;
+use Thelia\Model\OrderProductTax;
 use Thelia\Model\Product;
+use Thelia\Model\TaxRule;
 use Thelia\Model\TaxRuleQuery;
+use Thelia\Tools\I18n;
 
 /**
  * Class Calculator
@@ -68,14 +71,34 @@ class Calculator
         $this->product = $product;
         $this->country = $country;
 
-        $this->taxRulesCollection = $this->taxRuleQuery->getTaxCalculatorCollection($product, $country);
+        $this->taxRulesCollection = $this->taxRuleQuery->getTaxCalculatorCollection($product->getTaxRule(), $country);
 
         return $this;
     }
 
-    public function getTaxAmountFromUntaxedPrice($untaxedPrice)
+    public function loadTaxRule(TaxRule $taxRule, Country $country)
     {
-        return $this->getTaxedPrice($untaxedPrice) - $untaxedPrice;
+        $this->product = null;
+        $this->country = null;
+        $this->taxRulesCollection = null;
+
+        if($taxRule->getId() === null) {
+            throw new TaxEngineException('TaxRule id is empty in Calculator::loadTaxRule', TaxEngineException::UNDEFINED_TAX_RULE);
+        }
+        if($country->getId() === null) {
+            throw new TaxEngineException('Country id is empty in Calculator::loadTaxRule', TaxEngineException::UNDEFINED_COUNTRY);
+        }
+
+        $this->country = $country;
+
+        $this->taxRulesCollection = $this->taxRuleQuery->getTaxCalculatorCollection($taxRule, $country);
+
+        return $this;
+    }
+
+    public function getTaxAmountFromUntaxedPrice($untaxedPrice, &$taxCollection = null)
+    {
+        return $this->getTaxedPrice($untaxedPrice, $taxCollection) - $untaxedPrice;
     }
 
     public function getTaxAmountFromTaxedPrice($taxedPrice)
@@ -83,7 +106,15 @@ class Calculator
         return $taxedPrice - $this->getUntaxedPrice($taxedPrice);
     }
 
-    public function getTaxedPrice($untaxedPrice)
+    /**
+     * @param      $untaxedPrice
+     * @param null $taxCollection returns OrderProductTaxCollection
+     * @param null $askedLocale
+     *
+     * @return int
+     * @throws \Thelia\Exception\TaxEngineException
+     */
+    public function getTaxedPrice($untaxedPrice, &$taxCollection = null, $askedLocale = null)
     {
         if(null === $this->taxRulesCollection) {
             throw new TaxEngineException('Tax rules collection is empty in Calculator::getTaxAmount', TaxEngineException::UNDEFINED_TAX_RULES_COLLECTION);
@@ -97,6 +128,9 @@ class Calculator
         $currentPosition = 1;
         $currentTax = 0;
 
+        if(null !== $taxCollection) {
+            $taxCollection = new OrderProductTaxCollection();
+        }
         foreach($this->taxRulesCollection as $taxRule) {
             $position = (int)$taxRule->getTaxRuleCountryPosition();
 
@@ -109,7 +143,17 @@ class Calculator
                 $currentPosition = $position;
             }
 
-            $currentTax += $taxType->calculate($taxedPrice);
+            $taxAmount = round($taxType->calculate($taxedPrice), 2);
+            $currentTax += $taxAmount;
+
+            if(null !== $taxCollection) {
+                $taxI18n = I18n::forceI18nRetrieving($askedLocale, 'Tax', $taxRule->getId());
+                $orderProductTax = new OrderProductTax();
+                $orderProductTax->setTitle($taxI18n->getTitle());
+                $orderProductTax->setDescription($taxI18n->getDescription());
+                $orderProductTax->setAmount($taxAmount);
+                $taxCollection->addTax($orderProductTax);
+            }
         }
 
         $taxedPrice += $currentTax;
diff --git a/core/lib/Thelia/TaxEngine/OrderProductTaxCollection.php b/core/lib/Thelia/TaxEngine/OrderProductTaxCollection.php
new file mode 100755
index 000000000..5c4ac2022
--- /dev/null
+++ b/core/lib/Thelia/TaxEngine/OrderProductTaxCollection.php
@@ -0,0 +1,126 @@
+<?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\TaxEngine;
+
+use Thelia\Model\OrderProductTax;
+
+/**
+ *
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ *
+ */
+class OrderProductTaxCollection implements \Iterator
+{
+    private $position;
+    protected $taxes = array();
+
+    public function __construct()
+    {
+        foreach (func_get_args() as $tax) {
+            $this->addTax($tax);
+        }
+    }
+
+    public function isEmpty()
+    {
+        return count($this->taxes) == 0;
+    }
+
+    /**
+     * @param OrderProductTax $tax
+     *
+     * @return OrderProductTaxCollection
+     */
+    public function addTax(OrderProductTax $tax)
+    {
+        $this->taxes[] = $tax;
+
+        return $this;
+    }
+
+    public function getCount()
+    {
+        return count($this->taxes);
+    }
+
+    /**
+     * (PHP 5 &gt;= 5.0.0)<br/>
+     * Return the current element
+     * @link http://php.net/manual/en/iterator.current.php
+     * @return OrderProductTax
+     */
+    public function current()
+    {
+        return $this->taxes[$this->position];
+    }
+
+    /**
+     * (PHP 5 &gt;= 5.0.0)<br/>
+     * Move forward to next element
+     * @link http://php.net/manual/en/iterator.next.php
+     * @return void Any returned value is ignored.
+     */
+    public function next()
+    {
+        $this->position++;
+    }
+
+    /**
+     * (PHP 5 &gt;= 5.0.0)<br/>
+     * Return the key of the current element
+     * @link http://php.net/manual/en/iterator.key.php
+     * @return mixed scalar on success, or null on failure.
+     */
+    public function key()
+    {
+        return $this->position;
+    }
+
+    /**
+     * (PHP 5 &gt;= 5.0.0)<br/>
+     * Checks if current position is valid
+     * @link http://php.net/manual/en/iterator.valid.php
+     * @return boolean The return value will be casted to boolean and then evaluated.
+     * Returns true on success or false on failure.
+     */
+    public function valid()
+    {
+        return isset($this->taxes[$this->position]);
+    }
+
+    /**
+     * (PHP 5 &gt;= 5.0.0)<br/>
+     * Rewind the Iterator to the first element
+     * @link http://php.net/manual/en/iterator.rewind.php
+     * @return void Any returned value is ignored.
+     */
+    public function rewind()
+    {
+        $this->position = 0;
+    }
+
+    public function getKey($key)
+    {
+        return isset($this->taxes[$key]) ? $this->taxes[$key] : null;
+    }
+}
diff --git a/core/lib/Thelia/Tests/TaxEngine/CalculatorTest.php b/core/lib/Thelia/Tests/TaxEngine/CalculatorTest.php
index 502b14c7e..f8c6ec6c0 100755
--- a/core/lib/Thelia/Tests/TaxEngine/CalculatorTest.php
+++ b/core/lib/Thelia/Tests/TaxEngine/CalculatorTest.php
@@ -86,7 +86,7 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
         $taxRuleQuery = $this->getMock('\Thelia\Model\TaxRuleQuery', array('getTaxCalculatorCollection'));
         $taxRuleQuery->expects($this->once())
             ->method('getTaxCalculatorCollection')
-            ->with($productQuery, $countryQuery)
+            ->with($productQuery->getTaxRule(), $countryQuery)
             ->will($this->returnValue('foo'));
 
         $rewritingUrlQuery = $this->getProperty('taxRuleQuery');
diff --git a/core/lib/Thelia/Tools/I18n.php b/core/lib/Thelia/Tools/I18n.php
index 1f3ff57dd..aeb79ca84 100644
--- a/core/lib/Thelia/Tools/I18n.php
+++ b/core/lib/Thelia/Tools/I18n.php
@@ -23,6 +23,8 @@
 
 namespace Thelia\Tools;
 
+use Propel\Runtime\ActiveQuery\ModelCriteria;
+use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
 use Thelia\Model\Lang;
 
 /**
@@ -54,4 +56,39 @@ class I18n
 
         return \DateTime::createFromFormat($currentDateFormat, $date);
     }
+
+    public static function forceI18nRetrieving($askedLocale, $modelName, $id, $needed = array('Title'))
+    {
+        $i18nQueryClass = sprintf("\\Thelia\\Model\\%sI18nQuery", $modelName);
+        $i18nClass = sprintf("\\Thelia\\Model\\%sI18n", $modelName);
+
+        /* get customer language translation */
+        $i18n = $i18nQueryClass::create()
+            ->filterById($id)
+            ->filterByLocale(
+                $askedLocale
+            )->findOne();
+        /* or default translation */
+        if(null === $i18n) {
+            $i18n = $i18nQueryClass::create()
+                ->filterById($id)
+                ->filterByLocale(
+                    Lang::getDefaultLanguage()->getLocale()
+                )->findOne();
+        }
+        if(null === $i18n) { // @todo something else ?
+            $i18n = new $i18nClass();;
+            $i18n->setId($id);
+            foreach($needed as $need) {
+                $method = sprintf('set%s', $need);
+                if(method_exists($i18n, $method)) {
+                    $i18n->$method('DEFAULT ' . strtoupper($need));
+                } else {
+                    // @todo throw sg ?
+                }
+            }
+        }
+
+        return $i18n;
+    }
 }
diff --git a/install/insert.sql b/install/insert.sql
index aa7573d12..df252d366 100755
--- a/install/insert.sql
+++ b/install/insert.sql
@@ -1153,7 +1153,7 @@ INSERT INTO  `tax` (`id`, `type`, `serialized_requirements`, `created_at`, `upda
 INSERT INTO `tax_i18n` (`id`, `locale`, `title`)
   VALUES
   (1, 'fr_FR', 'TVA française à 19.6%'),
-  (1, 'en_UK', 'french 19.6% tax');
+  (1, 'en_US', 'french 19.6% tax');
 
 INSERT INTO  `tax_rule` (`id`, `is_default`, `created_at`, `updated_at`)
   VALUES
@@ -1162,7 +1162,7 @@ INSERT INTO  `tax_rule` (`id`, `is_default`, `created_at`, `updated_at`)
 INSERT INTO `tax_rule_i18n` (`id`, `locale`, `title`)
   VALUES
   (1, 'fr_FR', 'TVA française à 19.6%'),
-  (1, 'en_UK', 'french 19.6% tax');
+  (1, 'en_US', 'french 19.6% tax');
 
 INSERT INTO  `tax_rule_country` (`tax_rule_id`, `country_id`, `tax_id`, `position`, `created_at`, `updated_at`)
   VALUES
diff --git a/local/modules/Cheque/Cheque.php b/local/modules/Cheque/Cheque.php
index f4438db4e..4516c84f3 100755
--- a/local/modules/Cheque/Cheque.php
+++ b/local/modules/Cheque/Cheque.php
@@ -71,6 +71,15 @@ class Cheque extends BaseModule implements PaymentModuleInterface
         if(ModuleImageQuery::create()->filterByModule($module)->count() == 0) {
             $this->deployImageFolder($module, sprintf('%s/images', __DIR__));
         }
+
+        /* set module title */
+        $this->setTitle(
+            $module,
+            array(
+                "en_US" => "Cheque",
+                "fr_FR" => "Cheque",
+            )
+        );
     }
 
     public function destroy()
diff --git a/local/modules/FakeCB/FakeCB.php b/local/modules/FakeCB/FakeCB.php
index 7b304420c..329bbac41 100755
--- a/local/modules/FakeCB/FakeCB.php
+++ b/local/modules/FakeCB/FakeCB.php
@@ -71,6 +71,15 @@ class FakeCB extends BaseModule implements PaymentModuleInterface
         if(ModuleImageQuery::create()->filterByModule($module)->count() == 0) {
             $this->deployImageFolder($module, sprintf('%s/images', __DIR__));
         }
+
+        /* set module title */
+        $this->setTitle(
+            $module,
+            array(
+                "en_US" => "Credit Card",
+                "fr_FR" => "Credit Card",
+            )
+        );
     }
 
     public function destroy()
diff --git a/templates/default/order_payment.html b/templates/default/order_placed.html
similarity index 85%
rename from templates/default/order_payment.html
rename to templates/default/order_placed.html
index 884230258..c4a26af67 100644
--- a/templates/default/order_payment.html
+++ b/templates/default/order_placed.html
@@ -24,9 +24,11 @@
                 <a href="cart-step4.php" role="button" class="btn btn-step active"><span class="step-nb">4</span> <span class="step-label">Secure payment</span></a>
             </div>
 
+            {loop type="order" name="placed-order" id=$placed_order_id}
+
             <div id="payment-success" class="panel">
                 <div class="panel-heading">
-                    <h3 class="panel-title">You chose to pay by : <span class="payment-method">Cheque</span></h3>
+                    <h3 class="panel-title">You chose to pay by : <span class="payment-method">{loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}</span></h3>
                 </div>
                 <div class="panel-body">
                     <h3>Thank you for the trust you place in us.</h3>
@@ -35,15 +37,17 @@
 
                     <dl class="dl-horizontal">
                         <dt>Order number : </dt>
-                        <dd>PRO123456788978979</dd>
+                        <dd>{$REF}</dd>
                         <dt>Date : </dt>
-                        <dd>02/12/2013</dd>
+                        <dd>{format_date date=$CREATE_DATE output="date"}</dd>
                         <dt>Total : </dt>
-                        <dd>$216.25</dd>
+                        <dd>{loop type="currency" name="order-currency" id=$CURRENCY}{$SYMBOL}{/loop} {$TOTAL_TAXED_AMOUNT}</dd>
                     </dl>
                 </div>
             </div>
 
+            {/loop}
+
             <a href="{navigate to="index"}" role="button" class="btn btn-checkout-home"><span>Go home</span></a>
 
         </article>

From 61191b9d326407f50a18b9152cd28608286df81c Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Fri, 20 Sep 2013 16:31:19 +0200
Subject: [PATCH 47/51] fixes order integration

---
 local/modules/FakeCB/FakeCB.php     | 2 +-
 templates/default/order_placed.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/local/modules/FakeCB/FakeCB.php b/local/modules/FakeCB/FakeCB.php
index 329bbac41..ca682fab3 100755
--- a/local/modules/FakeCB/FakeCB.php
+++ b/local/modules/FakeCB/FakeCB.php
@@ -77,7 +77,7 @@ class FakeCB extends BaseModule implements PaymentModuleInterface
             $module,
             array(
                 "en_US" => "Credit Card",
-                "fr_FR" => "Credit Card",
+                "fr_FR" => "Carte de crédit",
             )
         );
     }
diff --git a/templates/default/order_placed.html b/templates/default/order_placed.html
index c4a26af67..281800bb5 100644
--- a/templates/default/order_placed.html
+++ b/templates/default/order_placed.html
@@ -32,7 +32,7 @@
                 </div>
                 <div class="panel-body">
                     <h3>Thank you for the trust you place in us.</h3>
-                    <p>A summary of your order email has been sent to the following address: email@toto.com</p>
+                    <p>A summary of your order email has been sent to the following address: {customer attr="email"}</p>
                     <p>Your order will be confirmed by us upon receipt of your payment.</p>
 
                     <dl class="dl-horizontal">

From 1a962d701d6bc1a4c3d56bb744a95af743d00136 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 20 Sep 2013 16:31:25 +0200
Subject: [PATCH 48/51] translate some missing string

---
 templates/default/includes/category-toolbar.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/default/includes/category-toolbar.html b/templates/default/includes/category-toolbar.html
index 99583a02d..b3a6c7daa 100644
--- a/templates/default/includes/category-toolbar.html
+++ b/templates/default/includes/category-toolbar.html
@@ -1,10 +1,10 @@
 <div class="toolbar toolbar-{$toolbar}" role="toolbar">
     {if $toolbar == "top" }
     <div class="sorter-container">
-        <span class="amount">9 Item(s)</span>
+        {*<span class="amount">9 {intl l="Item(s)"}</span>*}
 
             <span class="limiter">
-                <label for="limit-top">Show</label>
+                <label for="limit-top">{intl l="Show"}</label>
                 <select id="limit-top" name="limit">
                     <option value="{url path="{category attr="url"}" limit="4"}" {if $limit==4}selected{/if}>4</option>
                     <option value="{url path="{category attr="url"}" limit="8"}" {if $limit==8}selected{/if}>8</option>
@@ -12,7 +12,7 @@
                     <option value="{url path="{category attr="url"}" limit="50"}"{if $limit==50}selected{/if}>50</option>
                     <option value="{url path="{category attr="url"}" limit="9999999999"}" {if $limit==9999999999}selected{/if}>All</option>
                 </select>
-                <span class="per-page"> per page</span>
+                <span class="per-page">{intl l="per page"}</span>
             </span><!-- /.limiter -->
 
             <span class="sort-by">

From 44d6bbdb4a3989f8c1f6d2661c2153bbb39cc063 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 20 Sep 2013 16:48:37 +0200
Subject: [PATCH 49/51] comment dev menu in layout

---
 templates/default/layout.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl
index 37cbad224..82a8e27c9 100644
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -61,7 +61,7 @@ URL: http://www.thelia.net
             <!-- Place everything within .nav-collapse to hide it until above 768px -->
             <nav class="navbar-collapse collapse nav-main" role="navigation" aria-label="Main Navigation">
                 <ul class="nav navbar-nav navbar-categories">
-                    <li class="active"><a href="{url path="/"}" class="home" tabindex="-1">Home</a></li>
+{*                    <li class="active"><a href="{url path="/"}" class="home" tabindex="-1">Home</a></li>
                     <li class="dropdown">
                         <a href="" data-toggle="dropdown" class="dropdown-toggle">Pages</a>
                         <ul class="dropdown-menu list-subnav" role="menu">
@@ -79,8 +79,8 @@ URL: http://www.thelia.net
                             <li><a href="product-details.html">Product details</a></li>
                             <li><a href="address.html">New address</a></li>
                         </ul>
-                    </li>
-                    {loop type="category" name="category.navigation" parent="0" limit="3"}
+                    </li>*}
+                    {loop type="category" name="category.navigation" parent="0"}
                         <li><a href="{$URL}">{$TITLE}</a></li>
                     {/loop}
                 </ul>

From bf11fa19584ccc5bbc359d012487ede5f682abd8 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 20 Sep 2013 16:56:23 +0200
Subject: [PATCH 50/51] re-add home link in menu

---
 templates/default/layout.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl
index 82a8e27c9..4aba10120 100644
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -61,8 +61,8 @@ URL: http://www.thelia.net
             <!-- Place everything within .nav-collapse to hide it until above 768px -->
             <nav class="navbar-collapse collapse nav-main" role="navigation" aria-label="Main Navigation">
                 <ul class="nav navbar-nav navbar-categories">
-{*                    <li class="active"><a href="{url path="/"}" class="home" tabindex="-1">Home</a></li>
-                    <li class="dropdown">
+                    <li class="active"><a href="{url path="/"}" class="home" tabindex="-1">Home</a></li>
+{*                    <li class="dropdown">
                         <a href="" data-toggle="dropdown" class="dropdown-toggle">Pages</a>
                         <ul class="dropdown-menu list-subnav" role="menu">
                             <li class="active"><a href="index.html" tabindex="-1">Index</a></li>

From b7af3ebaa3560b1a1d8148d6af3055754be3c2e6 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Fri, 20 Sep 2013 17:02:19 +0200
Subject: [PATCH 51/51] push model

---
 .../Base/OrderProductAttributeCombination.php | 1824 +++++++++++++++++
 .../OrderProductAttributeCombinationQuery.php |  897 ++++++++
 .../lib/Thelia/Model/Base/OrderProductTax.php | 1534 ++++++++++++++
 .../Model/Base/OrderProductTaxQuery.php       |  744 +++++++
 ...derProductAttributeCombinationTableMap.php |  503 +++++
 .../Model/Map/OrderProductTaxTableMap.php     |  463 +++++
 .../OrderProductAttributeCombination.php      |   10 +
 .../OrderProductAttributeCombinationQuery.php |   21 +
 core/lib/Thelia/Model/OrderProductTax.php     |   10 +
 .../lib/Thelia/Model/OrderProductTaxQuery.php |   21 +
 10 files changed, 6027 insertions(+)
 create mode 100644 core/lib/Thelia/Model/Base/OrderProductAttributeCombination.php
 create mode 100644 core/lib/Thelia/Model/Base/OrderProductAttributeCombinationQuery.php
 create mode 100644 core/lib/Thelia/Model/Base/OrderProductTax.php
 create mode 100644 core/lib/Thelia/Model/Base/OrderProductTaxQuery.php
 create mode 100644 core/lib/Thelia/Model/Map/OrderProductAttributeCombinationTableMap.php
 create mode 100644 core/lib/Thelia/Model/Map/OrderProductTaxTableMap.php
 create mode 100644 core/lib/Thelia/Model/OrderProductAttributeCombination.php
 create mode 100644 core/lib/Thelia/Model/OrderProductAttributeCombinationQuery.php
 create mode 100644 core/lib/Thelia/Model/OrderProductTax.php
 create mode 100644 core/lib/Thelia/Model/OrderProductTaxQuery.php

diff --git a/core/lib/Thelia/Model/Base/OrderProductAttributeCombination.php b/core/lib/Thelia/Model/Base/OrderProductAttributeCombination.php
new file mode 100644
index 000000000..e02bc9cc5
--- /dev/null
+++ b/core/lib/Thelia/Model/Base/OrderProductAttributeCombination.php
@@ -0,0 +1,1824 @@
+<?php
+
+namespace Thelia\Model\Base;
+
+use \DateTime;
+use \Exception;
+use \PDO;
+use Propel\Runtime\Propel;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
+use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
+use Propel\Runtime\Collection\Collection;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Exception\BadMethodCallException;
+use Propel\Runtime\Exception\PropelException;
+use Propel\Runtime\Map\TableMap;
+use Propel\Runtime\Parser\AbstractParser;
+use Propel\Runtime\Util\PropelDateTime;
+use Thelia\Model\OrderProduct as ChildOrderProduct;
+use Thelia\Model\OrderProductAttributeCombination as ChildOrderProductAttributeCombination;
+use Thelia\Model\OrderProductAttributeCombinationQuery as ChildOrderProductAttributeCombinationQuery;
+use Thelia\Model\OrderProductQuery as ChildOrderProductQuery;
+use Thelia\Model\Map\OrderProductAttributeCombinationTableMap;
+
+abstract class OrderProductAttributeCombination implements ActiveRecordInterface
+{
+    /**
+     * TableMap class name
+     */
+    const TABLE_MAP = '\\Thelia\\Model\\Map\\OrderProductAttributeCombinationTableMap';
+
+
+    /**
+     * attribute to determine if this object has previously been saved.
+     * @var boolean
+     */
+    protected $new = true;
+
+    /**
+     * attribute to determine whether this object has been deleted.
+     * @var boolean
+     */
+    protected $deleted = false;
+
+    /**
+     * The columns that have been modified in current object.
+     * Tracking modified columns allows us to only update modified columns.
+     * @var array
+     */
+    protected $modifiedColumns = array();
+
+    /**
+     * The (virtual) columns that are added at runtime
+     * The formatters can add supplementary columns based on a resultset
+     * @var array
+     */
+    protected $virtualColumns = array();
+
+    /**
+     * The value for the id field.
+     * @var        int
+     */
+    protected $id;
+
+    /**
+     * The value for the order_product_id field.
+     * @var        int
+     */
+    protected $order_product_id;
+
+    /**
+     * The value for the attribute_title field.
+     * @var        string
+     */
+    protected $attribute_title;
+
+    /**
+     * The value for the attribute_chapo field.
+     * @var        string
+     */
+    protected $attribute_chapo;
+
+    /**
+     * The value for the attribute_description field.
+     * @var        string
+     */
+    protected $attribute_description;
+
+    /**
+     * The value for the attribute_postscriptumn field.
+     * @var        string
+     */
+    protected $attribute_postscriptumn;
+
+    /**
+     * The value for the attribute_av_title field.
+     * @var        string
+     */
+    protected $attribute_av_title;
+
+    /**
+     * The value for the attribute_av_chapo field.
+     * @var        string
+     */
+    protected $attribute_av_chapo;
+
+    /**
+     * The value for the attribute_av_description field.
+     * @var        string
+     */
+    protected $attribute_av_description;
+
+    /**
+     * The value for the attribute_av_postscriptum field.
+     * @var        string
+     */
+    protected $attribute_av_postscriptum;
+
+    /**
+     * The value for the created_at field.
+     * @var        string
+     */
+    protected $created_at;
+
+    /**
+     * The value for the updated_at field.
+     * @var        string
+     */
+    protected $updated_at;
+
+    /**
+     * @var        OrderProduct
+     */
+    protected $aOrderProduct;
+
+    /**
+     * Flag to prevent endless save loop, if this object is referenced
+     * by another object which falls in this transaction.
+     *
+     * @var boolean
+     */
+    protected $alreadyInSave = false;
+
+    /**
+     * Initializes internal state of Thelia\Model\Base\OrderProductAttributeCombination object.
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Returns whether the object has been modified.
+     *
+     * @return boolean True if the object has been modified.
+     */
+    public function isModified()
+    {
+        return !empty($this->modifiedColumns);
+    }
+
+    /**
+     * Has specified column been modified?
+     *
+     * @param  string  $col column fully qualified name (TableMap::TYPE_COLNAME), e.g. Book::AUTHOR_ID
+     * @return boolean True if $col has been modified.
+     */
+    public function isColumnModified($col)
+    {
+        return in_array($col, $this->modifiedColumns);
+    }
+
+    /**
+     * Get the columns that have been modified in this object.
+     * @return array A unique list of the modified column names for this object.
+     */
+    public function getModifiedColumns()
+    {
+        return array_unique($this->modifiedColumns);
+    }
+
+    /**
+     * Returns whether the object has ever been saved.  This will
+     * be false, if the object was retrieved from storage or was created
+     * and then saved.
+     *
+     * @return true, if the object has never been persisted.
+     */
+    public function isNew()
+    {
+        return $this->new;
+    }
+
+    /**
+     * Setter for the isNew attribute.  This method will be called
+     * by Propel-generated children and objects.
+     *
+     * @param boolean $b the state of the object.
+     */
+    public function setNew($b)
+    {
+        $this->new = (Boolean) $b;
+    }
+
+    /**
+     * Whether this object has been deleted.
+     * @return boolean The deleted state of this object.
+     */
+    public function isDeleted()
+    {
+        return $this->deleted;
+    }
+
+    /**
+     * Specify whether this object has been deleted.
+     * @param  boolean $b The deleted state of this object.
+     * @return void
+     */
+    public function setDeleted($b)
+    {
+        $this->deleted = (Boolean) $b;
+    }
+
+    /**
+     * Sets the modified state for the object to be false.
+     * @param  string $col If supplied, only the specified column is reset.
+     * @return void
+     */
+    public function resetModified($col = null)
+    {
+        if (null !== $col) {
+            while (false !== ($offset = array_search($col, $this->modifiedColumns))) {
+                array_splice($this->modifiedColumns, $offset, 1);
+            }
+        } else {
+            $this->modifiedColumns = array();
+        }
+    }
+
+    /**
+     * Compares this with another <code>OrderProductAttributeCombination</code> instance.  If
+     * <code>obj</code> is an instance of <code>OrderProductAttributeCombination</code>, delegates to
+     * <code>equals(OrderProductAttributeCombination)</code>.  Otherwise, returns <code>false</code>.
+     *
+     * @param      obj The object to compare to.
+     * @return Whether equal to the object specified.
+     */
+    public function equals($obj)
+    {
+        $thisclazz = get_class($this);
+        if (!is_object($obj) || !($obj instanceof $thisclazz)) {
+            return false;
+        }
+
+        if ($this === $obj) {
+            return true;
+        }
+
+        if (null === $this->getPrimaryKey()
+            || null === $obj->getPrimaryKey())  {
+            return false;
+        }
+
+        return $this->getPrimaryKey() === $obj->getPrimaryKey();
+    }
+
+    /**
+     * If the primary key is not null, return the hashcode of the
+     * primary key. Otherwise, return the hash code of the object.
+     *
+     * @return int Hashcode
+     */
+    public function hashCode()
+    {
+        if (null !== $this->getPrimaryKey()) {
+            return crc32(serialize($this->getPrimaryKey()));
+        }
+
+        return crc32(serialize(clone $this));
+    }
+
+    /**
+     * Get the associative array of the virtual columns in this object
+     *
+     * @param string $name The virtual column name
+     *
+     * @return array
+     */
+    public function getVirtualColumns()
+    {
+        return $this->virtualColumns;
+    }
+
+    /**
+     * Checks the existence of a virtual column in this object
+     *
+     * @return boolean
+     */
+    public function hasVirtualColumn($name)
+    {
+        return array_key_exists($name, $this->virtualColumns);
+    }
+
+    /**
+     * Get the value of a virtual column in this object
+     *
+     * @return mixed
+     */
+    public function getVirtualColumn($name)
+    {
+        if (!$this->hasVirtualColumn($name)) {
+            throw new PropelException(sprintf('Cannot get value of inexistent virtual column %s.', $name));
+        }
+
+        return $this->virtualColumns[$name];
+    }
+
+    /**
+     * Set the value of a virtual column in this object
+     *
+     * @param string $name  The virtual column name
+     * @param mixed  $value The value to give to the virtual column
+     *
+     * @return OrderProductAttributeCombination The current object, for fluid interface
+     */
+    public function setVirtualColumn($name, $value)
+    {
+        $this->virtualColumns[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Logs a message using Propel::log().
+     *
+     * @param  string  $msg
+     * @param  int     $priority One of the Propel::LOG_* logging levels
+     * @return boolean
+     */
+    protected function log($msg, $priority = Propel::LOG_INFO)
+    {
+        return Propel::log(get_class($this) . ': ' . $msg, $priority);
+    }
+
+    /**
+     * Populate the current object from a string, using a given parser format
+     * <code>
+     * $book = new Book();
+     * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
+     * </code>
+     *
+     * @param mixed $parser A AbstractParser instance,
+     *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
+     * @param string $data The source data to import from
+     *
+     * @return OrderProductAttributeCombination The current object, for fluid interface
+     */
+    public function importFrom($parser, $data)
+    {
+        if (!$parser instanceof AbstractParser) {
+            $parser = AbstractParser::getParser($parser);
+        }
+
+        return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME);
+    }
+
+    /**
+     * Export the current object properties to a string, using a given parser format
+     * <code>
+     * $book = BookQuery::create()->findPk(9012);
+     * echo $book->exportTo('JSON');
+     *  => {"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
+     * </code>
+     *
+     * @param  mixed   $parser                 A AbstractParser instance, or a format name ('XML', 'YAML', 'JSON', 'CSV')
+     * @param  boolean $includeLazyLoadColumns (optional) Whether to include lazy load(ed) columns. Defaults to TRUE.
+     * @return string  The exported data
+     */
+    public function exportTo($parser, $includeLazyLoadColumns = true)
+    {
+        if (!$parser instanceof AbstractParser) {
+            $parser = AbstractParser::getParser($parser);
+        }
+
+        return $parser->fromArray($this->toArray(TableMap::TYPE_PHPNAME, $includeLazyLoadColumns, array(), true));
+    }
+
+    /**
+     * Clean up internal collections prior to serializing
+     * Avoids recursive loops that turn into segmentation faults when serializing
+     */
+    public function __sleep()
+    {
+        $this->clearAllReferences();
+
+        return array_keys(get_object_vars($this));
+    }
+
+    /**
+     * Get the [id] column value.
+     *
+     * @return   int
+     */
+    public function getId()
+    {
+
+        return $this->id;
+    }
+
+    /**
+     * Get the [order_product_id] column value.
+     *
+     * @return   int
+     */
+    public function getOrderProductId()
+    {
+
+        return $this->order_product_id;
+    }
+
+    /**
+     * Get the [attribute_title] column value.
+     *
+     * @return   string
+     */
+    public function getAttributeTitle()
+    {
+
+        return $this->attribute_title;
+    }
+
+    /**
+     * Get the [attribute_chapo] column value.
+     *
+     * @return   string
+     */
+    public function getAttributeChapo()
+    {
+
+        return $this->attribute_chapo;
+    }
+
+    /**
+     * Get the [attribute_description] column value.
+     *
+     * @return   string
+     */
+    public function getAttributeDescription()
+    {
+
+        return $this->attribute_description;
+    }
+
+    /**
+     * Get the [attribute_postscriptumn] column value.
+     *
+     * @return   string
+     */
+    public function getAttributePostscriptumn()
+    {
+
+        return $this->attribute_postscriptumn;
+    }
+
+    /**
+     * Get the [attribute_av_title] column value.
+     *
+     * @return   string
+     */
+    public function getAttributeAvTitle()
+    {
+
+        return $this->attribute_av_title;
+    }
+
+    /**
+     * Get the [attribute_av_chapo] column value.
+     *
+     * @return   string
+     */
+    public function getAttributeAvChapo()
+    {
+
+        return $this->attribute_av_chapo;
+    }
+
+    /**
+     * Get the [attribute_av_description] column value.
+     *
+     * @return   string
+     */
+    public function getAttributeAvDescription()
+    {
+
+        return $this->attribute_av_description;
+    }
+
+    /**
+     * Get the [attribute_av_postscriptum] column value.
+     *
+     * @return   string
+     */
+    public function getAttributeAvPostscriptum()
+    {
+
+        return $this->attribute_av_postscriptum;
+    }
+
+    /**
+     * Get the [optionally formatted] temporal [created_at] column value.
+     *
+     *
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
+     *                            If format is NULL, then the raw \DateTime object will be returned.
+     *
+     * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
+     *
+     * @throws PropelException - if unable to parse/validate the date/time value.
+     */
+    public function getCreatedAt($format = NULL)
+    {
+        if ($format === null) {
+            return $this->created_at;
+        } else {
+            return $this->created_at !== null ? $this->created_at->format($format) : null;
+        }
+    }
+
+    /**
+     * Get the [optionally formatted] temporal [updated_at] column value.
+     *
+     *
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
+     *                            If format is NULL, then the raw \DateTime object will be returned.
+     *
+     * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
+     *
+     * @throws PropelException - if unable to parse/validate the date/time value.
+     */
+    public function getUpdatedAt($format = NULL)
+    {
+        if ($format === null) {
+            return $this->updated_at;
+        } else {
+            return $this->updated_at !== null ? $this->updated_at->format($format) : null;
+        }
+    }
+
+    /**
+     * Set the value of [id] column.
+     *
+     * @param      int $v new value
+     * @return   \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support)
+     */
+    public function setId($v)
+    {
+        if ($v !== null) {
+            $v = (int) $v;
+        }
+
+        if ($this->id !== $v) {
+            $this->id = $v;
+            $this->modifiedColumns[] = OrderProductAttributeCombinationTableMap::ID;
+        }
+
+
+        return $this;
+    } // setId()
+
+    /**
+     * Set the value of [order_product_id] column.
+     *
+     * @param      int $v new value
+     * @return   \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support)
+     */
+    public function setOrderProductId($v)
+    {
+        if ($v !== null) {
+            $v = (int) $v;
+        }
+
+        if ($this->order_product_id !== $v) {
+            $this->order_product_id = $v;
+            $this->modifiedColumns[] = OrderProductAttributeCombinationTableMap::ORDER_PRODUCT_ID;
+        }
+
+        if ($this->aOrderProduct !== null && $this->aOrderProduct->getId() !== $v) {
+            $this->aOrderProduct = null;
+        }
+
+
+        return $this;
+    } // setOrderProductId()
+
+    /**
+     * Set the value of [attribute_title] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support)
+     */
+    public function setAttributeTitle($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->attribute_title !== $v) {
+            $this->attribute_title = $v;
+            $this->modifiedColumns[] = OrderProductAttributeCombinationTableMap::ATTRIBUTE_TITLE;
+        }
+
+
+        return $this;
+    } // setAttributeTitle()
+
+    /**
+     * Set the value of [attribute_chapo] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support)
+     */
+    public function setAttributeChapo($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->attribute_chapo !== $v) {
+            $this->attribute_chapo = $v;
+            $this->modifiedColumns[] = OrderProductAttributeCombinationTableMap::ATTRIBUTE_CHAPO;
+        }
+
+
+        return $this;
+    } // setAttributeChapo()
+
+    /**
+     * Set the value of [attribute_description] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support)
+     */
+    public function setAttributeDescription($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->attribute_description !== $v) {
+            $this->attribute_description = $v;
+            $this->modifiedColumns[] = OrderProductAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION;
+        }
+
+
+        return $this;
+    } // setAttributeDescription()
+
+    /**
+     * Set the value of [attribute_postscriptumn] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support)
+     */
+    public function setAttributePostscriptumn($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->attribute_postscriptumn !== $v) {
+            $this->attribute_postscriptumn = $v;
+            $this->modifiedColumns[] = OrderProductAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN;
+        }
+
+
+        return $this;
+    } // setAttributePostscriptumn()
+
+    /**
+     * Set the value of [attribute_av_title] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support)
+     */
+    public function setAttributeAvTitle($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->attribute_av_title !== $v) {
+            $this->attribute_av_title = $v;
+            $this->modifiedColumns[] = OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE;
+        }
+
+
+        return $this;
+    } // setAttributeAvTitle()
+
+    /**
+     * Set the value of [attribute_av_chapo] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support)
+     */
+    public function setAttributeAvChapo($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->attribute_av_chapo !== $v) {
+            $this->attribute_av_chapo = $v;
+            $this->modifiedColumns[] = OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO;
+        }
+
+
+        return $this;
+    } // setAttributeAvChapo()
+
+    /**
+     * Set the value of [attribute_av_description] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support)
+     */
+    public function setAttributeAvDescription($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->attribute_av_description !== $v) {
+            $this->attribute_av_description = $v;
+            $this->modifiedColumns[] = OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION;
+        }
+
+
+        return $this;
+    } // setAttributeAvDescription()
+
+    /**
+     * Set the value of [attribute_av_postscriptum] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support)
+     */
+    public function setAttributeAvPostscriptum($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->attribute_av_postscriptum !== $v) {
+            $this->attribute_av_postscriptum = $v;
+            $this->modifiedColumns[] = OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM;
+        }
+
+
+        return $this;
+    } // setAttributeAvPostscriptum()
+
+    /**
+     * Sets the value of [created_at] column to a normalized version of the date/time value specified.
+     *
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
+     *               Empty strings are treated as NULL.
+     * @return   \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support)
+     */
+    public function setCreatedAt($v)
+    {
+        $dt = PropelDateTime::newInstance($v, null, '\DateTime');
+        if ($this->created_at !== null || $dt !== null) {
+            if ($dt !== $this->created_at) {
+                $this->created_at = $dt;
+                $this->modifiedColumns[] = OrderProductAttributeCombinationTableMap::CREATED_AT;
+            }
+        } // if either are not null
+
+
+        return $this;
+    } // setCreatedAt()
+
+    /**
+     * Sets the value of [updated_at] column to a normalized version of the date/time value specified.
+     *
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
+     *               Empty strings are treated as NULL.
+     * @return   \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support)
+     */
+    public function setUpdatedAt($v)
+    {
+        $dt = PropelDateTime::newInstance($v, null, '\DateTime');
+        if ($this->updated_at !== null || $dt !== null) {
+            if ($dt !== $this->updated_at) {
+                $this->updated_at = $dt;
+                $this->modifiedColumns[] = OrderProductAttributeCombinationTableMap::UPDATED_AT;
+            }
+        } // if either are not null
+
+
+        return $this;
+    } // setUpdatedAt()
+
+    /**
+     * Indicates whether the columns in this object are only set to default values.
+     *
+     * This method can be used in conjunction with isModified() to indicate whether an object is both
+     * modified _and_ has some values set which are non-default.
+     *
+     * @return boolean Whether the columns in this object are only been set with default values.
+     */
+    public function hasOnlyDefaultValues()
+    {
+        // otherwise, everything was equal, so return TRUE
+        return true;
+    } // hasOnlyDefaultValues()
+
+    /**
+     * Hydrates (populates) the object variables with values from the database resultset.
+     *
+     * An offset (0-based "start column") is specified so that objects can be hydrated
+     * with a subset of the columns in the resultset rows.  This is needed, for example,
+     * for results of JOIN queries where the resultset row includes columns from two or
+     * more tables.
+     *
+     * @param array   $row       The row returned by DataFetcher->fetch().
+     * @param int     $startcol  0-based offset column which indicates which restultset column to start with.
+     * @param boolean $rehydrate Whether this object is being re-hydrated from the database.
+     * @param string  $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+                                  One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                            TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *
+     * @return int             next starting column
+     * @throws PropelException - Any caught Exception will be rewrapped as a PropelException.
+     */
+    public function hydrate($row, $startcol = 0, $rehydrate = false, $indexType = TableMap::TYPE_NUM)
+    {
+        try {
+
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : OrderProductAttributeCombinationTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->id = (null !== $col) ? (int) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : OrderProductAttributeCombinationTableMap::translateFieldName('OrderProductId', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->order_product_id = (null !== $col) ? (int) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : OrderProductAttributeCombinationTableMap::translateFieldName('AttributeTitle', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->attribute_title = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : OrderProductAttributeCombinationTableMap::translateFieldName('AttributeChapo', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->attribute_chapo = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : OrderProductAttributeCombinationTableMap::translateFieldName('AttributeDescription', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->attribute_description = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : OrderProductAttributeCombinationTableMap::translateFieldName('AttributePostscriptumn', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->attribute_postscriptumn = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : OrderProductAttributeCombinationTableMap::translateFieldName('AttributeAvTitle', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->attribute_av_title = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : OrderProductAttributeCombinationTableMap::translateFieldName('AttributeAvChapo', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->attribute_av_chapo = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : OrderProductAttributeCombinationTableMap::translateFieldName('AttributeAvDescription', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->attribute_av_description = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : OrderProductAttributeCombinationTableMap::translateFieldName('AttributeAvPostscriptum', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->attribute_av_postscriptum = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : OrderProductAttributeCombinationTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            if ($col === '0000-00-00 00:00:00') {
+                $col = null;
+            }
+            $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : OrderProductAttributeCombinationTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            if ($col === '0000-00-00 00:00:00') {
+                $col = null;
+            }
+            $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
+            $this->resetModified();
+
+            $this->setNew(false);
+
+            if ($rehydrate) {
+                $this->ensureConsistency();
+            }
+
+            return $startcol + 12; // 12 = OrderProductAttributeCombinationTableMap::NUM_HYDRATE_COLUMNS.
+
+        } catch (Exception $e) {
+            throw new PropelException("Error populating \Thelia\Model\OrderProductAttributeCombination object", 0, $e);
+        }
+    }
+
+    /**
+     * Checks and repairs the internal consistency of the object.
+     *
+     * This method is executed after an already-instantiated object is re-hydrated
+     * from the database.  It exists to check any foreign keys to make sure that
+     * the objects related to the current object are correct based on foreign key.
+     *
+     * You can override this method in the stub class, but you should always invoke
+     * the base method from the overridden method (i.e. parent::ensureConsistency()),
+     * in case your model changes.
+     *
+     * @throws PropelException
+     */
+    public function ensureConsistency()
+    {
+        if ($this->aOrderProduct !== null && $this->order_product_id !== $this->aOrderProduct->getId()) {
+            $this->aOrderProduct = null;
+        }
+    } // ensureConsistency
+
+    /**
+     * Reloads this object from datastore based on primary key and (optionally) resets all associated objects.
+     *
+     * This will only work if the object has been saved and has a valid primary key set.
+     *
+     * @param      boolean $deep (optional) Whether to also de-associated any related objects.
+     * @param      ConnectionInterface $con (optional) The ConnectionInterface connection to use.
+     * @return void
+     * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db
+     */
+    public function reload($deep = false, ConnectionInterface $con = null)
+    {
+        if ($this->isDeleted()) {
+            throw new PropelException("Cannot reload a deleted object.");
+        }
+
+        if ($this->isNew()) {
+            throw new PropelException("Cannot reload an unsaved object.");
+        }
+
+        if ($con === null) {
+            $con = Propel::getServiceContainer()->getReadConnection(OrderProductAttributeCombinationTableMap::DATABASE_NAME);
+        }
+
+        // We don't need to alter the object instance pool; we're just modifying this instance
+        // already in the pool.
+
+        $dataFetcher = ChildOrderProductAttributeCombinationQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con);
+        $row = $dataFetcher->fetch();
+        $dataFetcher->close();
+        if (!$row) {
+            throw new PropelException('Cannot find matching row in the database to reload object values.');
+        }
+        $this->hydrate($row, 0, true, $dataFetcher->getIndexType()); // rehydrate
+
+        if ($deep) {  // also de-associate any related objects?
+
+            $this->aOrderProduct = null;
+        } // if (deep)
+    }
+
+    /**
+     * Removes this object from datastore and sets delete attribute.
+     *
+     * @param      ConnectionInterface $con
+     * @return void
+     * @throws PropelException
+     * @see OrderProductAttributeCombination::setDeleted()
+     * @see OrderProductAttributeCombination::isDeleted()
+     */
+    public function delete(ConnectionInterface $con = null)
+    {
+        if ($this->isDeleted()) {
+            throw new PropelException("This object has already been deleted.");
+        }
+
+        if ($con === null) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductAttributeCombinationTableMap::DATABASE_NAME);
+        }
+
+        $con->beginTransaction();
+        try {
+            $deleteQuery = ChildOrderProductAttributeCombinationQuery::create()
+                ->filterByPrimaryKey($this->getPrimaryKey());
+            $ret = $this->preDelete($con);
+            if ($ret) {
+                $deleteQuery->delete($con);
+                $this->postDelete($con);
+                $con->commit();
+                $this->setDeleted(true);
+            } else {
+                $con->commit();
+            }
+        } catch (Exception $e) {
+            $con->rollBack();
+            throw $e;
+        }
+    }
+
+    /**
+     * Persists this object to the database.
+     *
+     * If the object is new, it inserts it; otherwise an update is performed.
+     * All modified related objects will also be persisted in the doSave()
+     * method.  This method wraps all precipitate database operations in a
+     * single transaction.
+     *
+     * @param      ConnectionInterface $con
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @throws PropelException
+     * @see doSave()
+     */
+    public function save(ConnectionInterface $con = null)
+    {
+        if ($this->isDeleted()) {
+            throw new PropelException("You cannot save an object that has been deleted.");
+        }
+
+        if ($con === null) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductAttributeCombinationTableMap::DATABASE_NAME);
+        }
+
+        $con->beginTransaction();
+        $isInsert = $this->isNew();
+        try {
+            $ret = $this->preSave($con);
+            if ($isInsert) {
+                $ret = $ret && $this->preInsert($con);
+                // timestampable behavior
+                if (!$this->isColumnModified(OrderProductAttributeCombinationTableMap::CREATED_AT)) {
+                    $this->setCreatedAt(time());
+                }
+                if (!$this->isColumnModified(OrderProductAttributeCombinationTableMap::UPDATED_AT)) {
+                    $this->setUpdatedAt(time());
+                }
+            } else {
+                $ret = $ret && $this->preUpdate($con);
+                // timestampable behavior
+                if ($this->isModified() && !$this->isColumnModified(OrderProductAttributeCombinationTableMap::UPDATED_AT)) {
+                    $this->setUpdatedAt(time());
+                }
+            }
+            if ($ret) {
+                $affectedRows = $this->doSave($con);
+                if ($isInsert) {
+                    $this->postInsert($con);
+                } else {
+                    $this->postUpdate($con);
+                }
+                $this->postSave($con);
+                OrderProductAttributeCombinationTableMap::addInstanceToPool($this);
+            } else {
+                $affectedRows = 0;
+            }
+            $con->commit();
+
+            return $affectedRows;
+        } catch (Exception $e) {
+            $con->rollBack();
+            throw $e;
+        }
+    }
+
+    /**
+     * Performs the work of inserting or updating the row in the database.
+     *
+     * If the object is new, it inserts it; otherwise an update is performed.
+     * All related objects are also updated in this method.
+     *
+     * @param      ConnectionInterface $con
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @throws PropelException
+     * @see save()
+     */
+    protected function doSave(ConnectionInterface $con)
+    {
+        $affectedRows = 0; // initialize var to track total num of affected rows
+        if (!$this->alreadyInSave) {
+            $this->alreadyInSave = true;
+
+            // We call the save method on the following object(s) if they
+            // were passed to this object by their corresponding set
+            // method.  This object relates to these object(s) by a
+            // foreign key reference.
+
+            if ($this->aOrderProduct !== null) {
+                if ($this->aOrderProduct->isModified() || $this->aOrderProduct->isNew()) {
+                    $affectedRows += $this->aOrderProduct->save($con);
+                }
+                $this->setOrderProduct($this->aOrderProduct);
+            }
+
+            if ($this->isNew() || $this->isModified()) {
+                // persist changes
+                if ($this->isNew()) {
+                    $this->doInsert($con);
+                } else {
+                    $this->doUpdate($con);
+                }
+                $affectedRows += 1;
+                $this->resetModified();
+            }
+
+            $this->alreadyInSave = false;
+
+        }
+
+        return $affectedRows;
+    } // doSave()
+
+    /**
+     * Insert the row in the database.
+     *
+     * @param      ConnectionInterface $con
+     *
+     * @throws PropelException
+     * @see doSave()
+     */
+    protected function doInsert(ConnectionInterface $con)
+    {
+        $modifiedColumns = array();
+        $index = 0;
+
+        $this->modifiedColumns[] = OrderProductAttributeCombinationTableMap::ID;
+        if (null !== $this->id) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key (' . OrderProductAttributeCombinationTableMap::ID . ')');
+        }
+
+         // check the columns in natural order for more readable SQL queries
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ID)) {
+            $modifiedColumns[':p' . $index++]  = 'ID';
+        }
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ORDER_PRODUCT_ID)) {
+            $modifiedColumns[':p' . $index++]  = 'ORDER_PRODUCT_ID';
+        }
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ATTRIBUTE_TITLE)) {
+            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_TITLE';
+        }
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ATTRIBUTE_CHAPO)) {
+            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_CHAPO';
+        }
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION)) {
+            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_DESCRIPTION';
+        }
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN)) {
+            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_POSTSCRIPTUMN';
+        }
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE)) {
+            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_AV_TITLE';
+        }
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO)) {
+            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_AV_CHAPO';
+        }
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION)) {
+            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_AV_DESCRIPTION';
+        }
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM)) {
+            $modifiedColumns[':p' . $index++]  = 'ATTRIBUTE_AV_POSTSCRIPTUM';
+        }
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::CREATED_AT)) {
+            $modifiedColumns[':p' . $index++]  = 'CREATED_AT';
+        }
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::UPDATED_AT)) {
+            $modifiedColumns[':p' . $index++]  = 'UPDATED_AT';
+        }
+
+        $sql = sprintf(
+            'INSERT INTO order_product_attribute_combination (%s) VALUES (%s)',
+            implode(', ', $modifiedColumns),
+            implode(', ', array_keys($modifiedColumns))
+        );
+
+        try {
+            $stmt = $con->prepare($sql);
+            foreach ($modifiedColumns as $identifier => $columnName) {
+                switch ($columnName) {
+                    case 'ID':
+                        $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
+                        break;
+                    case 'ORDER_PRODUCT_ID':
+                        $stmt->bindValue($identifier, $this->order_product_id, PDO::PARAM_INT);
+                        break;
+                    case 'ATTRIBUTE_TITLE':
+                        $stmt->bindValue($identifier, $this->attribute_title, PDO::PARAM_STR);
+                        break;
+                    case 'ATTRIBUTE_CHAPO':
+                        $stmt->bindValue($identifier, $this->attribute_chapo, PDO::PARAM_STR);
+                        break;
+                    case 'ATTRIBUTE_DESCRIPTION':
+                        $stmt->bindValue($identifier, $this->attribute_description, PDO::PARAM_STR);
+                        break;
+                    case 'ATTRIBUTE_POSTSCRIPTUMN':
+                        $stmt->bindValue($identifier, $this->attribute_postscriptumn, PDO::PARAM_STR);
+                        break;
+                    case 'ATTRIBUTE_AV_TITLE':
+                        $stmt->bindValue($identifier, $this->attribute_av_title, PDO::PARAM_STR);
+                        break;
+                    case 'ATTRIBUTE_AV_CHAPO':
+                        $stmt->bindValue($identifier, $this->attribute_av_chapo, PDO::PARAM_STR);
+                        break;
+                    case 'ATTRIBUTE_AV_DESCRIPTION':
+                        $stmt->bindValue($identifier, $this->attribute_av_description, PDO::PARAM_STR);
+                        break;
+                    case 'ATTRIBUTE_AV_POSTSCRIPTUM':
+                        $stmt->bindValue($identifier, $this->attribute_av_postscriptum, PDO::PARAM_STR);
+                        break;
+                    case 'CREATED_AT':
+                        $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
+                        break;
+                    case 'UPDATED_AT':
+                        $stmt->bindValue($identifier, $this->updated_at ? $this->updated_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
+                        break;
+                }
+            }
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e);
+        }
+
+        try {
+            $pk = $con->lastInsertId();
+        } catch (Exception $e) {
+            throw new PropelException('Unable to get autoincrement id.', 0, $e);
+        }
+        $this->setId($pk);
+
+        $this->setNew(false);
+    }
+
+    /**
+     * Update the row in the database.
+     *
+     * @param      ConnectionInterface $con
+     *
+     * @return Integer Number of updated rows
+     * @see doSave()
+     */
+    protected function doUpdate(ConnectionInterface $con)
+    {
+        $selectCriteria = $this->buildPkeyCriteria();
+        $valuesCriteria = $this->buildCriteria();
+
+        return $selectCriteria->doUpdate($valuesCriteria, $con);
+    }
+
+    /**
+     * Retrieves a field from the object by name passed in as a string.
+     *
+     * @param      string $name name
+     * @param      string $type The type of fieldname the $name is of:
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
+     * @return mixed Value of field.
+     */
+    public function getByName($name, $type = TableMap::TYPE_PHPNAME)
+    {
+        $pos = OrderProductAttributeCombinationTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
+        $field = $this->getByPosition($pos);
+
+        return $field;
+    }
+
+    /**
+     * Retrieves a field from the object by Position as specified in the xml schema.
+     * Zero-based.
+     *
+     * @param      int $pos position in xml schema
+     * @return mixed Value of field at $pos
+     */
+    public function getByPosition($pos)
+    {
+        switch ($pos) {
+            case 0:
+                return $this->getId();
+                break;
+            case 1:
+                return $this->getOrderProductId();
+                break;
+            case 2:
+                return $this->getAttributeTitle();
+                break;
+            case 3:
+                return $this->getAttributeChapo();
+                break;
+            case 4:
+                return $this->getAttributeDescription();
+                break;
+            case 5:
+                return $this->getAttributePostscriptumn();
+                break;
+            case 6:
+                return $this->getAttributeAvTitle();
+                break;
+            case 7:
+                return $this->getAttributeAvChapo();
+                break;
+            case 8:
+                return $this->getAttributeAvDescription();
+                break;
+            case 9:
+                return $this->getAttributeAvPostscriptum();
+                break;
+            case 10:
+                return $this->getCreatedAt();
+                break;
+            case 11:
+                return $this->getUpdatedAt();
+                break;
+            default:
+                return null;
+                break;
+        } // switch()
+    }
+
+    /**
+     * Exports the object as an array.
+     *
+     * You can specify the key type of the array by passing one of the class
+     * type constants.
+     *
+     * @param     string  $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+     *                    TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                    Defaults to TableMap::TYPE_PHPNAME.
+     * @param     boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
+     * @param     array $alreadyDumpedObjects List of objects to skip to avoid recursion
+     * @param     boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE.
+     *
+     * @return array an associative array containing the field names (as keys) and field values
+     */
+    public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false)
+    {
+        if (isset($alreadyDumpedObjects['OrderProductAttributeCombination'][$this->getPrimaryKey()])) {
+            return '*RECURSION*';
+        }
+        $alreadyDumpedObjects['OrderProductAttributeCombination'][$this->getPrimaryKey()] = true;
+        $keys = OrderProductAttributeCombinationTableMap::getFieldNames($keyType);
+        $result = array(
+            $keys[0] => $this->getId(),
+            $keys[1] => $this->getOrderProductId(),
+            $keys[2] => $this->getAttributeTitle(),
+            $keys[3] => $this->getAttributeChapo(),
+            $keys[4] => $this->getAttributeDescription(),
+            $keys[5] => $this->getAttributePostscriptumn(),
+            $keys[6] => $this->getAttributeAvTitle(),
+            $keys[7] => $this->getAttributeAvChapo(),
+            $keys[8] => $this->getAttributeAvDescription(),
+            $keys[9] => $this->getAttributeAvPostscriptum(),
+            $keys[10] => $this->getCreatedAt(),
+            $keys[11] => $this->getUpdatedAt(),
+        );
+        $virtualColumns = $this->virtualColumns;
+        foreach($virtualColumns as $key => $virtualColumn)
+        {
+            $result[$key] = $virtualColumn;
+        }
+
+        if ($includeForeignObjects) {
+            if (null !== $this->aOrderProduct) {
+                $result['OrderProduct'] = $this->aOrderProduct->toArray($keyType, $includeLazyLoadColumns,  $alreadyDumpedObjects, true);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Sets a field from the object by name passed in as a string.
+     *
+     * @param      string $name
+     * @param      mixed  $value field value
+     * @param      string $type The type of fieldname the $name is of:
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
+     * @return void
+     */
+    public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
+    {
+        $pos = OrderProductAttributeCombinationTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
+
+        return $this->setByPosition($pos, $value);
+    }
+
+    /**
+     * Sets a field from the object by Position as specified in the xml schema.
+     * Zero-based.
+     *
+     * @param      int $pos position in xml schema
+     * @param      mixed $value field value
+     * @return void
+     */
+    public function setByPosition($pos, $value)
+    {
+        switch ($pos) {
+            case 0:
+                $this->setId($value);
+                break;
+            case 1:
+                $this->setOrderProductId($value);
+                break;
+            case 2:
+                $this->setAttributeTitle($value);
+                break;
+            case 3:
+                $this->setAttributeChapo($value);
+                break;
+            case 4:
+                $this->setAttributeDescription($value);
+                break;
+            case 5:
+                $this->setAttributePostscriptumn($value);
+                break;
+            case 6:
+                $this->setAttributeAvTitle($value);
+                break;
+            case 7:
+                $this->setAttributeAvChapo($value);
+                break;
+            case 8:
+                $this->setAttributeAvDescription($value);
+                break;
+            case 9:
+                $this->setAttributeAvPostscriptum($value);
+                break;
+            case 10:
+                $this->setCreatedAt($value);
+                break;
+            case 11:
+                $this->setUpdatedAt($value);
+                break;
+        } // switch()
+    }
+
+    /**
+     * Populates the object using an array.
+     *
+     * This is particularly useful when populating an object from one of the
+     * request arrays (e.g. $_POST).  This method goes through the column
+     * names, checking to see whether a matching key exists in populated
+     * array. If so the setByName() method is called for that column.
+     *
+     * You can specify the key type of the array by additionally passing one
+     * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+     * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     * The default key type is the column's TableMap::TYPE_PHPNAME.
+     *
+     * @param      array  $arr     An array to populate the object from.
+     * @param      string $keyType The type of keys the array uses.
+     * @return void
+     */
+    public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
+    {
+        $keys = OrderProductAttributeCombinationTableMap::getFieldNames($keyType);
+
+        if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
+        if (array_key_exists($keys[1], $arr)) $this->setOrderProductId($arr[$keys[1]]);
+        if (array_key_exists($keys[2], $arr)) $this->setAttributeTitle($arr[$keys[2]]);
+        if (array_key_exists($keys[3], $arr)) $this->setAttributeChapo($arr[$keys[3]]);
+        if (array_key_exists($keys[4], $arr)) $this->setAttributeDescription($arr[$keys[4]]);
+        if (array_key_exists($keys[5], $arr)) $this->setAttributePostscriptumn($arr[$keys[5]]);
+        if (array_key_exists($keys[6], $arr)) $this->setAttributeAvTitle($arr[$keys[6]]);
+        if (array_key_exists($keys[7], $arr)) $this->setAttributeAvChapo($arr[$keys[7]]);
+        if (array_key_exists($keys[8], $arr)) $this->setAttributeAvDescription($arr[$keys[8]]);
+        if (array_key_exists($keys[9], $arr)) $this->setAttributeAvPostscriptum($arr[$keys[9]]);
+        if (array_key_exists($keys[10], $arr)) $this->setCreatedAt($arr[$keys[10]]);
+        if (array_key_exists($keys[11], $arr)) $this->setUpdatedAt($arr[$keys[11]]);
+    }
+
+    /**
+     * Build a Criteria object containing the values of all modified columns in this object.
+     *
+     * @return Criteria The Criteria object containing all modified values.
+     */
+    public function buildCriteria()
+    {
+        $criteria = new Criteria(OrderProductAttributeCombinationTableMap::DATABASE_NAME);
+
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ID)) $criteria->add(OrderProductAttributeCombinationTableMap::ID, $this->id);
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ORDER_PRODUCT_ID)) $criteria->add(OrderProductAttributeCombinationTableMap::ORDER_PRODUCT_ID, $this->order_product_id);
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ATTRIBUTE_TITLE)) $criteria->add(OrderProductAttributeCombinationTableMap::ATTRIBUTE_TITLE, $this->attribute_title);
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ATTRIBUTE_CHAPO)) $criteria->add(OrderProductAttributeCombinationTableMap::ATTRIBUTE_CHAPO, $this->attribute_chapo);
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION)) $criteria->add(OrderProductAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION, $this->attribute_description);
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN)) $criteria->add(OrderProductAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN, $this->attribute_postscriptumn);
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE)) $criteria->add(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE, $this->attribute_av_title);
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO)) $criteria->add(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO, $this->attribute_av_chapo);
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION)) $criteria->add(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION, $this->attribute_av_description);
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM)) $criteria->add(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM, $this->attribute_av_postscriptum);
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::CREATED_AT)) $criteria->add(OrderProductAttributeCombinationTableMap::CREATED_AT, $this->created_at);
+        if ($this->isColumnModified(OrderProductAttributeCombinationTableMap::UPDATED_AT)) $criteria->add(OrderProductAttributeCombinationTableMap::UPDATED_AT, $this->updated_at);
+
+        return $criteria;
+    }
+
+    /**
+     * Builds a Criteria object containing the primary key for this object.
+     *
+     * Unlike buildCriteria() this method includes the primary key values regardless
+     * of whether or not they have been modified.
+     *
+     * @return Criteria The Criteria object containing value(s) for primary key(s).
+     */
+    public function buildPkeyCriteria()
+    {
+        $criteria = new Criteria(OrderProductAttributeCombinationTableMap::DATABASE_NAME);
+        $criteria->add(OrderProductAttributeCombinationTableMap::ID, $this->id);
+
+        return $criteria;
+    }
+
+    /**
+     * Returns the primary key for this object (row).
+     * @return   int
+     */
+    public function getPrimaryKey()
+    {
+        return $this->getId();
+    }
+
+    /**
+     * Generic method to set the primary key (id column).
+     *
+     * @param       int $key Primary key.
+     * @return void
+     */
+    public function setPrimaryKey($key)
+    {
+        $this->setId($key);
+    }
+
+    /**
+     * Returns true if the primary key for this object is null.
+     * @return boolean
+     */
+    public function isPrimaryKeyNull()
+    {
+
+        return null === $this->getId();
+    }
+
+    /**
+     * Sets contents of passed object to values from current object.
+     *
+     * If desired, this method can also make copies of all associated (fkey referrers)
+     * objects.
+     *
+     * @param      object $copyObj An object of \Thelia\Model\OrderProductAttributeCombination (or compatible) type.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $makeNew Whether to reset autoincrement PKs and make the object new.
+     * @throws PropelException
+     */
+    public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
+    {
+        $copyObj->setOrderProductId($this->getOrderProductId());
+        $copyObj->setAttributeTitle($this->getAttributeTitle());
+        $copyObj->setAttributeChapo($this->getAttributeChapo());
+        $copyObj->setAttributeDescription($this->getAttributeDescription());
+        $copyObj->setAttributePostscriptumn($this->getAttributePostscriptumn());
+        $copyObj->setAttributeAvTitle($this->getAttributeAvTitle());
+        $copyObj->setAttributeAvChapo($this->getAttributeAvChapo());
+        $copyObj->setAttributeAvDescription($this->getAttributeAvDescription());
+        $copyObj->setAttributeAvPostscriptum($this->getAttributeAvPostscriptum());
+        $copyObj->setCreatedAt($this->getCreatedAt());
+        $copyObj->setUpdatedAt($this->getUpdatedAt());
+        if ($makeNew) {
+            $copyObj->setNew(true);
+            $copyObj->setId(NULL); // this is a auto-increment column, so set to default value
+        }
+    }
+
+    /**
+     * Makes a copy of this object that will be inserted as a new row in table when saved.
+     * It creates a new object filling in the simple attributes, but skipping any primary
+     * keys that are defined for the table.
+     *
+     * If desired, this method can also make copies of all associated (fkey referrers)
+     * objects.
+     *
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @return                 \Thelia\Model\OrderProductAttributeCombination Clone of current object.
+     * @throws PropelException
+     */
+    public function copy($deepCopy = false)
+    {
+        // we use get_class(), because this might be a subclass
+        $clazz = get_class($this);
+        $copyObj = new $clazz();
+        $this->copyInto($copyObj, $deepCopy);
+
+        return $copyObj;
+    }
+
+    /**
+     * Declares an association between this object and a ChildOrderProduct object.
+     *
+     * @param                  ChildOrderProduct $v
+     * @return                 \Thelia\Model\OrderProductAttributeCombination The current object (for fluent API support)
+     * @throws PropelException
+     */
+    public function setOrderProduct(ChildOrderProduct $v = null)
+    {
+        if ($v === null) {
+            $this->setOrderProductId(NULL);
+        } else {
+            $this->setOrderProductId($v->getId());
+        }
+
+        $this->aOrderProduct = $v;
+
+        // Add binding for other direction of this n:n relationship.
+        // If this object has already been added to the ChildOrderProduct object, it will not be re-added.
+        if ($v !== null) {
+            $v->addOrderProductAttributeCombination($this);
+        }
+
+
+        return $this;
+    }
+
+
+    /**
+     * Get the associated ChildOrderProduct object
+     *
+     * @param      ConnectionInterface $con Optional Connection object.
+     * @return                 ChildOrderProduct The associated ChildOrderProduct object.
+     * @throws PropelException
+     */
+    public function getOrderProduct(ConnectionInterface $con = null)
+    {
+        if ($this->aOrderProduct === null && ($this->order_product_id !== null)) {
+            $this->aOrderProduct = ChildOrderProductQuery::create()->findPk($this->order_product_id, $con);
+            /* The following can be used additionally to
+                guarantee the related object contains a reference
+                to this object.  This level of coupling may, however, be
+                undesirable since it could result in an only partially populated collection
+                in the referenced object.
+                $this->aOrderProduct->addOrderProductAttributeCombinations($this);
+             */
+        }
+
+        return $this->aOrderProduct;
+    }
+
+    /**
+     * Clears the current object and sets all attributes to their default values
+     */
+    public function clear()
+    {
+        $this->id = null;
+        $this->order_product_id = null;
+        $this->attribute_title = null;
+        $this->attribute_chapo = null;
+        $this->attribute_description = null;
+        $this->attribute_postscriptumn = null;
+        $this->attribute_av_title = null;
+        $this->attribute_av_chapo = null;
+        $this->attribute_av_description = null;
+        $this->attribute_av_postscriptum = null;
+        $this->created_at = null;
+        $this->updated_at = null;
+        $this->alreadyInSave = false;
+        $this->clearAllReferences();
+        $this->resetModified();
+        $this->setNew(true);
+        $this->setDeleted(false);
+    }
+
+    /**
+     * Resets all references to other model objects or collections of model objects.
+     *
+     * This method is a user-space workaround for PHP's inability to garbage collect
+     * objects with circular references (even in PHP 5.3). This is currently necessary
+     * when using Propel in certain daemon or large-volume/high-memory operations.
+     *
+     * @param      boolean $deep Whether to also clear the references on all referrer objects.
+     */
+    public function clearAllReferences($deep = false)
+    {
+        if ($deep) {
+        } // if ($deep)
+
+        $this->aOrderProduct = null;
+    }
+
+    /**
+     * Return the string representation of this object
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return (string) $this->exportTo(OrderProductAttributeCombinationTableMap::DEFAULT_STRING_FORMAT);
+    }
+
+    // timestampable behavior
+
+    /**
+     * Mark the current object so that the update date doesn't get updated during next save
+     *
+     * @return     ChildOrderProductAttributeCombination The current object (for fluent API support)
+     */
+    public function keepUpdateDateUnchanged()
+    {
+        $this->modifiedColumns[] = OrderProductAttributeCombinationTableMap::UPDATED_AT;
+
+        return $this;
+    }
+
+    /**
+     * Code to be run before persisting the object
+     * @param  ConnectionInterface $con
+     * @return boolean
+     */
+    public function preSave(ConnectionInterface $con = null)
+    {
+        return true;
+    }
+
+    /**
+     * Code to be run after persisting the object
+     * @param ConnectionInterface $con
+     */
+    public function postSave(ConnectionInterface $con = null)
+    {
+
+    }
+
+    /**
+     * Code to be run before inserting to database
+     * @param  ConnectionInterface $con
+     * @return boolean
+     */
+    public function preInsert(ConnectionInterface $con = null)
+    {
+        return true;
+    }
+
+    /**
+     * Code to be run after inserting to database
+     * @param ConnectionInterface $con
+     */
+    public function postInsert(ConnectionInterface $con = null)
+    {
+
+    }
+
+    /**
+     * Code to be run before updating the object in database
+     * @param  ConnectionInterface $con
+     * @return boolean
+     */
+    public function preUpdate(ConnectionInterface $con = null)
+    {
+        return true;
+    }
+
+    /**
+     * Code to be run after updating the object in database
+     * @param ConnectionInterface $con
+     */
+    public function postUpdate(ConnectionInterface $con = null)
+    {
+
+    }
+
+    /**
+     * Code to be run before deleting the object in database
+     * @param  ConnectionInterface $con
+     * @return boolean
+     */
+    public function preDelete(ConnectionInterface $con = null)
+    {
+        return true;
+    }
+
+    /**
+     * Code to be run after deleting the object in database
+     * @param ConnectionInterface $con
+     */
+    public function postDelete(ConnectionInterface $con = null)
+    {
+
+    }
+
+
+    /**
+     * Derived method to catches calls to undefined methods.
+     *
+     * Provides magic import/export method support (fromXML()/toXML(), fromYAML()/toYAML(), etc.).
+     * Allows to define default __call() behavior if you overwrite __call()
+     *
+     * @param string $name
+     * @param mixed  $params
+     *
+     * @return array|string
+     */
+    public function __call($name, $params)
+    {
+        if (0 === strpos($name, 'get')) {
+            $virtualColumn = substr($name, 3);
+            if ($this->hasVirtualColumn($virtualColumn)) {
+                return $this->getVirtualColumn($virtualColumn);
+            }
+
+            $virtualColumn = lcfirst($virtualColumn);
+            if ($this->hasVirtualColumn($virtualColumn)) {
+                return $this->getVirtualColumn($virtualColumn);
+            }
+        }
+
+        if (0 === strpos($name, 'from')) {
+            $format = substr($name, 4);
+
+            return $this->importFrom($format, reset($params));
+        }
+
+        if (0 === strpos($name, 'to')) {
+            $format = substr($name, 2);
+            $includeLazyLoadColumns = isset($params[0]) ? $params[0] : true;
+
+            return $this->exportTo($format, $includeLazyLoadColumns);
+        }
+
+        throw new BadMethodCallException(sprintf('Call to undefined method: %s.', $name));
+    }
+
+}
diff --git a/core/lib/Thelia/Model/Base/OrderProductAttributeCombinationQuery.php b/core/lib/Thelia/Model/Base/OrderProductAttributeCombinationQuery.php
new file mode 100644
index 000000000..9e8298aa5
--- /dev/null
+++ b/core/lib/Thelia/Model/Base/OrderProductAttributeCombinationQuery.php
@@ -0,0 +1,897 @@
+<?php
+
+namespace Thelia\Model\Base;
+
+use \Exception;
+use \PDO;
+use Propel\Runtime\Propel;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
+use Propel\Runtime\ActiveQuery\ModelJoin;
+use Propel\Runtime\Collection\Collection;
+use Propel\Runtime\Collection\ObjectCollection;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Exception\PropelException;
+use Thelia\Model\OrderProductAttributeCombination as ChildOrderProductAttributeCombination;
+use Thelia\Model\OrderProductAttributeCombinationQuery as ChildOrderProductAttributeCombinationQuery;
+use Thelia\Model\Map\OrderProductAttributeCombinationTableMap;
+
+/**
+ * Base class that represents a query for the 'order_product_attribute_combination' table.
+ *
+ *
+ *
+ * @method     ChildOrderProductAttributeCombinationQuery orderById($order = Criteria::ASC) Order by the id column
+ * @method     ChildOrderProductAttributeCombinationQuery orderByOrderProductId($order = Criteria::ASC) Order by the order_product_id column
+ * @method     ChildOrderProductAttributeCombinationQuery orderByAttributeTitle($order = Criteria::ASC) Order by the attribute_title column
+ * @method     ChildOrderProductAttributeCombinationQuery orderByAttributeChapo($order = Criteria::ASC) Order by the attribute_chapo column
+ * @method     ChildOrderProductAttributeCombinationQuery orderByAttributeDescription($order = Criteria::ASC) Order by the attribute_description column
+ * @method     ChildOrderProductAttributeCombinationQuery orderByAttributePostscriptumn($order = Criteria::ASC) Order by the attribute_postscriptumn column
+ * @method     ChildOrderProductAttributeCombinationQuery orderByAttributeAvTitle($order = Criteria::ASC) Order by the attribute_av_title column
+ * @method     ChildOrderProductAttributeCombinationQuery orderByAttributeAvChapo($order = Criteria::ASC) Order by the attribute_av_chapo column
+ * @method     ChildOrderProductAttributeCombinationQuery orderByAttributeAvDescription($order = Criteria::ASC) Order by the attribute_av_description column
+ * @method     ChildOrderProductAttributeCombinationQuery orderByAttributeAvPostscriptum($order = Criteria::ASC) Order by the attribute_av_postscriptum column
+ * @method     ChildOrderProductAttributeCombinationQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
+ * @method     ChildOrderProductAttributeCombinationQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
+ *
+ * @method     ChildOrderProductAttributeCombinationQuery groupById() Group by the id column
+ * @method     ChildOrderProductAttributeCombinationQuery groupByOrderProductId() Group by the order_product_id column
+ * @method     ChildOrderProductAttributeCombinationQuery groupByAttributeTitle() Group by the attribute_title column
+ * @method     ChildOrderProductAttributeCombinationQuery groupByAttributeChapo() Group by the attribute_chapo column
+ * @method     ChildOrderProductAttributeCombinationQuery groupByAttributeDescription() Group by the attribute_description column
+ * @method     ChildOrderProductAttributeCombinationQuery groupByAttributePostscriptumn() Group by the attribute_postscriptumn column
+ * @method     ChildOrderProductAttributeCombinationQuery groupByAttributeAvTitle() Group by the attribute_av_title column
+ * @method     ChildOrderProductAttributeCombinationQuery groupByAttributeAvChapo() Group by the attribute_av_chapo column
+ * @method     ChildOrderProductAttributeCombinationQuery groupByAttributeAvDescription() Group by the attribute_av_description column
+ * @method     ChildOrderProductAttributeCombinationQuery groupByAttributeAvPostscriptum() Group by the attribute_av_postscriptum column
+ * @method     ChildOrderProductAttributeCombinationQuery groupByCreatedAt() Group by the created_at column
+ * @method     ChildOrderProductAttributeCombinationQuery groupByUpdatedAt() Group by the updated_at column
+ *
+ * @method     ChildOrderProductAttributeCombinationQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
+ * @method     ChildOrderProductAttributeCombinationQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
+ * @method     ChildOrderProductAttributeCombinationQuery innerJoin($relation) Adds a INNER JOIN clause to the query
+ *
+ * @method     ChildOrderProductAttributeCombinationQuery leftJoinOrderProduct($relationAlias = null) Adds a LEFT JOIN clause to the query using the OrderProduct relation
+ * @method     ChildOrderProductAttributeCombinationQuery rightJoinOrderProduct($relationAlias = null) Adds a RIGHT JOIN clause to the query using the OrderProduct relation
+ * @method     ChildOrderProductAttributeCombinationQuery innerJoinOrderProduct($relationAlias = null) Adds a INNER JOIN clause to the query using the OrderProduct relation
+ *
+ * @method     ChildOrderProductAttributeCombination findOne(ConnectionInterface $con = null) Return the first ChildOrderProductAttributeCombination matching the query
+ * @method     ChildOrderProductAttributeCombination findOneOrCreate(ConnectionInterface $con = null) Return the first ChildOrderProductAttributeCombination matching the query, or a new ChildOrderProductAttributeCombination object populated from the query conditions when no match is found
+ *
+ * @method     ChildOrderProductAttributeCombination findOneById(int $id) Return the first ChildOrderProductAttributeCombination filtered by the id column
+ * @method     ChildOrderProductAttributeCombination findOneByOrderProductId(int $order_product_id) Return the first ChildOrderProductAttributeCombination filtered by the order_product_id column
+ * @method     ChildOrderProductAttributeCombination findOneByAttributeTitle(string $attribute_title) Return the first ChildOrderProductAttributeCombination filtered by the attribute_title column
+ * @method     ChildOrderProductAttributeCombination findOneByAttributeChapo(string $attribute_chapo) Return the first ChildOrderProductAttributeCombination filtered by the attribute_chapo column
+ * @method     ChildOrderProductAttributeCombination findOneByAttributeDescription(string $attribute_description) Return the first ChildOrderProductAttributeCombination filtered by the attribute_description column
+ * @method     ChildOrderProductAttributeCombination findOneByAttributePostscriptumn(string $attribute_postscriptumn) Return the first ChildOrderProductAttributeCombination filtered by the attribute_postscriptumn column
+ * @method     ChildOrderProductAttributeCombination findOneByAttributeAvTitle(string $attribute_av_title) Return the first ChildOrderProductAttributeCombination filtered by the attribute_av_title column
+ * @method     ChildOrderProductAttributeCombination findOneByAttributeAvChapo(string $attribute_av_chapo) Return the first ChildOrderProductAttributeCombination filtered by the attribute_av_chapo column
+ * @method     ChildOrderProductAttributeCombination findOneByAttributeAvDescription(string $attribute_av_description) Return the first ChildOrderProductAttributeCombination filtered by the attribute_av_description column
+ * @method     ChildOrderProductAttributeCombination findOneByAttributeAvPostscriptum(string $attribute_av_postscriptum) Return the first ChildOrderProductAttributeCombination filtered by the attribute_av_postscriptum column
+ * @method     ChildOrderProductAttributeCombination findOneByCreatedAt(string $created_at) Return the first ChildOrderProductAttributeCombination filtered by the created_at column
+ * @method     ChildOrderProductAttributeCombination findOneByUpdatedAt(string $updated_at) Return the first ChildOrderProductAttributeCombination filtered by the updated_at column
+ *
+ * @method     array findById(int $id) Return ChildOrderProductAttributeCombination objects filtered by the id column
+ * @method     array findByOrderProductId(int $order_product_id) Return ChildOrderProductAttributeCombination objects filtered by the order_product_id column
+ * @method     array findByAttributeTitle(string $attribute_title) Return ChildOrderProductAttributeCombination objects filtered by the attribute_title column
+ * @method     array findByAttributeChapo(string $attribute_chapo) Return ChildOrderProductAttributeCombination objects filtered by the attribute_chapo column
+ * @method     array findByAttributeDescription(string $attribute_description) Return ChildOrderProductAttributeCombination objects filtered by the attribute_description column
+ * @method     array findByAttributePostscriptumn(string $attribute_postscriptumn) Return ChildOrderProductAttributeCombination objects filtered by the attribute_postscriptumn column
+ * @method     array findByAttributeAvTitle(string $attribute_av_title) Return ChildOrderProductAttributeCombination objects filtered by the attribute_av_title column
+ * @method     array findByAttributeAvChapo(string $attribute_av_chapo) Return ChildOrderProductAttributeCombination objects filtered by the attribute_av_chapo column
+ * @method     array findByAttributeAvDescription(string $attribute_av_description) Return ChildOrderProductAttributeCombination objects filtered by the attribute_av_description column
+ * @method     array findByAttributeAvPostscriptum(string $attribute_av_postscriptum) Return ChildOrderProductAttributeCombination objects filtered by the attribute_av_postscriptum column
+ * @method     array findByCreatedAt(string $created_at) Return ChildOrderProductAttributeCombination objects filtered by the created_at column
+ * @method     array findByUpdatedAt(string $updated_at) Return ChildOrderProductAttributeCombination objects filtered by the updated_at column
+ *
+ */
+abstract class OrderProductAttributeCombinationQuery extends ModelCriteria
+{
+
+    /**
+     * Initializes internal state of \Thelia\Model\Base\OrderProductAttributeCombinationQuery object.
+     *
+     * @param     string $dbName The database name
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
+     */
+    public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\OrderProductAttributeCombination', $modelAlias = null)
+    {
+        parent::__construct($dbName, $modelName, $modelAlias);
+    }
+
+    /**
+     * Returns a new ChildOrderProductAttributeCombinationQuery object.
+     *
+     * @param     string $modelAlias The alias of a model in the query
+     * @param     Criteria $criteria Optional Criteria to build the query from
+     *
+     * @return ChildOrderProductAttributeCombinationQuery
+     */
+    public static function create($modelAlias = null, $criteria = null)
+    {
+        if ($criteria instanceof \Thelia\Model\OrderProductAttributeCombinationQuery) {
+            return $criteria;
+        }
+        $query = new \Thelia\Model\OrderProductAttributeCombinationQuery();
+        if (null !== $modelAlias) {
+            $query->setModelAlias($modelAlias);
+        }
+        if ($criteria instanceof Criteria) {
+            $query->mergeWith($criteria);
+        }
+
+        return $query;
+    }
+
+    /**
+     * Find object by primary key.
+     * Propel uses the instance pool to skip the database if the object exists.
+     * Go fast if the query is untouched.
+     *
+     * <code>
+     * $obj  = $c->findPk(12, $con);
+     * </code>
+     *
+     * @param mixed $key Primary key to use for the query
+     * @param ConnectionInterface $con an optional connection object
+     *
+     * @return ChildOrderProductAttributeCombination|array|mixed the result, formatted by the current formatter
+     */
+    public function findPk($key, $con = null)
+    {
+        if ($key === null) {
+            return null;
+        }
+        if ((null !== ($obj = OrderProductAttributeCombinationTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
+            // the object is already in the instance pool
+            return $obj;
+        }
+        if ($con === null) {
+            $con = Propel::getServiceContainer()->getReadConnection(OrderProductAttributeCombinationTableMap::DATABASE_NAME);
+        }
+        $this->basePreSelect($con);
+        if ($this->formatter || $this->modelAlias || $this->with || $this->select
+         || $this->selectColumns || $this->asColumns || $this->selectModifiers
+         || $this->map || $this->having || $this->joins) {
+            return $this->findPkComplex($key, $con);
+        } else {
+            return $this->findPkSimple($key, $con);
+        }
+    }
+
+    /**
+     * Find object by primary key using raw SQL to go fast.
+     * Bypass doSelect() and the object formatter by using generated code.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     ConnectionInterface $con A connection object
+     *
+     * @return   ChildOrderProductAttributeCombination A model object, or null if the key is not found
+     */
+    protected function findPkSimple($key, $con)
+    {
+        $sql = 'SELECT ID, ORDER_PRODUCT_ID, ATTRIBUTE_TITLE, ATTRIBUTE_CHAPO, ATTRIBUTE_DESCRIPTION, ATTRIBUTE_POSTSCRIPTUMN, ATTRIBUTE_AV_TITLE, ATTRIBUTE_AV_CHAPO, ATTRIBUTE_AV_DESCRIPTION, ATTRIBUTE_AV_POSTSCRIPTUM, CREATED_AT, UPDATED_AT FROM order_product_attribute_combination WHERE ID = :p0';
+        try {
+            $stmt = $con->prepare($sql);
+            $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
+        }
+        $obj = null;
+        if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
+            $obj = new ChildOrderProductAttributeCombination();
+            $obj->hydrate($row);
+            OrderProductAttributeCombinationTableMap::addInstanceToPool($obj, (string) $key);
+        }
+        $stmt->closeCursor();
+
+        return $obj;
+    }
+
+    /**
+     * Find object by primary key.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     ConnectionInterface $con A connection object
+     *
+     * @return ChildOrderProductAttributeCombination|array|mixed the result, formatted by the current formatter
+     */
+    protected function findPkComplex($key, $con)
+    {
+        // As the query uses a PK condition, no limit(1) is necessary.
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $dataFetcher = $criteria
+            ->filterByPrimaryKey($key)
+            ->doSelect($con);
+
+        return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher);
+    }
+
+    /**
+     * Find objects by primary key
+     * <code>
+     * $objs = $c->findPks(array(12, 56, 832), $con);
+     * </code>
+     * @param     array $keys Primary keys to use for the query
+     * @param     ConnectionInterface $con an optional connection object
+     *
+     * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
+     */
+    public function findPks($keys, $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getReadConnection($this->getDbName());
+        }
+        $this->basePreSelect($con);
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $dataFetcher = $criteria
+            ->filterByPrimaryKeys($keys)
+            ->doSelect($con);
+
+        return $criteria->getFormatter()->init($criteria)->format($dataFetcher);
+    }
+
+    /**
+     * Filter the query by primary key
+     *
+     * @param     mixed $key Primary key to use for the query
+     *
+     * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByPrimaryKey($key)
+    {
+
+        return $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ID, $key, Criteria::EQUAL);
+    }
+
+    /**
+     * Filter the query by a list of primary keys
+     *
+     * @param     array $keys The list of primary key to use for the query
+     *
+     * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByPrimaryKeys($keys)
+    {
+
+        return $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ID, $keys, Criteria::IN);
+    }
+
+    /**
+     * Filter the query on the id column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterById(1234); // WHERE id = 1234
+     * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
+     * $query->filterById(array('min' => 12)); // WHERE id > 12
+     * </code>
+     *
+     * @param     mixed $id The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterById($id = null, $comparison = null)
+    {
+        if (is_array($id)) {
+            $useMinMax = false;
+            if (isset($id['min'])) {
+                $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($id['max'])) {
+                $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ID, $id, $comparison);
+    }
+
+    /**
+     * Filter the query on the order_product_id column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByOrderProductId(1234); // WHERE order_product_id = 1234
+     * $query->filterByOrderProductId(array(12, 34)); // WHERE order_product_id IN (12, 34)
+     * $query->filterByOrderProductId(array('min' => 12)); // WHERE order_product_id > 12
+     * </code>
+     *
+     * @see       filterByOrderProduct()
+     *
+     * @param     mixed $orderProductId The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByOrderProductId($orderProductId = null, $comparison = null)
+    {
+        if (is_array($orderProductId)) {
+            $useMinMax = false;
+            if (isset($orderProductId['min'])) {
+                $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProductId['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($orderProductId['max'])) {
+                $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProductId['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProductId, $comparison);
+    }
+
+    /**
+     * Filter the query on the attribute_title column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByAttributeTitle('fooValue');   // WHERE attribute_title = 'fooValue'
+     * $query->filterByAttributeTitle('%fooValue%'); // WHERE attribute_title LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $attributeTitle The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByAttributeTitle($attributeTitle = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($attributeTitle)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $attributeTitle)) {
+                $attributeTitle = str_replace('*', '%', $attributeTitle);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ATTRIBUTE_TITLE, $attributeTitle, $comparison);
+    }
+
+    /**
+     * Filter the query on the attribute_chapo column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByAttributeChapo('fooValue');   // WHERE attribute_chapo = 'fooValue'
+     * $query->filterByAttributeChapo('%fooValue%'); // WHERE attribute_chapo LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $attributeChapo The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByAttributeChapo($attributeChapo = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($attributeChapo)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $attributeChapo)) {
+                $attributeChapo = str_replace('*', '%', $attributeChapo);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ATTRIBUTE_CHAPO, $attributeChapo, $comparison);
+    }
+
+    /**
+     * Filter the query on the attribute_description column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByAttributeDescription('fooValue');   // WHERE attribute_description = 'fooValue'
+     * $query->filterByAttributeDescription('%fooValue%'); // WHERE attribute_description LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $attributeDescription The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByAttributeDescription($attributeDescription = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($attributeDescription)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $attributeDescription)) {
+                $attributeDescription = str_replace('*', '%', $attributeDescription);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION, $attributeDescription, $comparison);
+    }
+
+    /**
+     * Filter the query on the attribute_postscriptumn column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByAttributePostscriptumn('fooValue');   // WHERE attribute_postscriptumn = 'fooValue'
+     * $query->filterByAttributePostscriptumn('%fooValue%'); // WHERE attribute_postscriptumn LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $attributePostscriptumn The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByAttributePostscriptumn($attributePostscriptumn = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($attributePostscriptumn)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $attributePostscriptumn)) {
+                $attributePostscriptumn = str_replace('*', '%', $attributePostscriptumn);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN, $attributePostscriptumn, $comparison);
+    }
+
+    /**
+     * Filter the query on the attribute_av_title column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByAttributeAvTitle('fooValue');   // WHERE attribute_av_title = 'fooValue'
+     * $query->filterByAttributeAvTitle('%fooValue%'); // WHERE attribute_av_title LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $attributeAvTitle The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByAttributeAvTitle($attributeAvTitle = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($attributeAvTitle)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $attributeAvTitle)) {
+                $attributeAvTitle = str_replace('*', '%', $attributeAvTitle);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE, $attributeAvTitle, $comparison);
+    }
+
+    /**
+     * Filter the query on the attribute_av_chapo column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByAttributeAvChapo('fooValue');   // WHERE attribute_av_chapo = 'fooValue'
+     * $query->filterByAttributeAvChapo('%fooValue%'); // WHERE attribute_av_chapo LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $attributeAvChapo The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByAttributeAvChapo($attributeAvChapo = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($attributeAvChapo)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $attributeAvChapo)) {
+                $attributeAvChapo = str_replace('*', '%', $attributeAvChapo);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO, $attributeAvChapo, $comparison);
+    }
+
+    /**
+     * Filter the query on the attribute_av_description column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByAttributeAvDescription('fooValue');   // WHERE attribute_av_description = 'fooValue'
+     * $query->filterByAttributeAvDescription('%fooValue%'); // WHERE attribute_av_description LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $attributeAvDescription The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByAttributeAvDescription($attributeAvDescription = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($attributeAvDescription)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $attributeAvDescription)) {
+                $attributeAvDescription = str_replace('*', '%', $attributeAvDescription);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION, $attributeAvDescription, $comparison);
+    }
+
+    /**
+     * Filter the query on the attribute_av_postscriptum column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByAttributeAvPostscriptum('fooValue');   // WHERE attribute_av_postscriptum = 'fooValue'
+     * $query->filterByAttributeAvPostscriptum('%fooValue%'); // WHERE attribute_av_postscriptum LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $attributeAvPostscriptum The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByAttributeAvPostscriptum($attributeAvPostscriptum = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($attributeAvPostscriptum)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $attributeAvPostscriptum)) {
+                $attributeAvPostscriptum = str_replace('*', '%', $attributeAvPostscriptum);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM, $attributeAvPostscriptum, $comparison);
+    }
+
+    /**
+     * Filter the query on the created_at column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14'
+     * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14'
+     * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
+     * </code>
+     *
+     * @param     mixed $createdAt The value to use as filter.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Empty strings are treated as NULL.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByCreatedAt($createdAt = null, $comparison = null)
+    {
+        if (is_array($createdAt)) {
+            $useMinMax = false;
+            if (isset($createdAt['min'])) {
+                $this->addUsingAlias(OrderProductAttributeCombinationTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($createdAt['max'])) {
+                $this->addUsingAlias(OrderProductAttributeCombinationTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductAttributeCombinationTableMap::CREATED_AT, $createdAt, $comparison);
+    }
+
+    /**
+     * Filter the query on the updated_at column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14'
+     * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14'
+     * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
+     * </code>
+     *
+     * @param     mixed $updatedAt The value to use as filter.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Empty strings are treated as NULL.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByUpdatedAt($updatedAt = null, $comparison = null)
+    {
+        if (is_array($updatedAt)) {
+            $useMinMax = false;
+            if (isset($updatedAt['min'])) {
+                $this->addUsingAlias(OrderProductAttributeCombinationTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($updatedAt['max'])) {
+                $this->addUsingAlias(OrderProductAttributeCombinationTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductAttributeCombinationTableMap::UPDATED_AT, $updatedAt, $comparison);
+    }
+
+    /**
+     * Filter the query by a related \Thelia\Model\OrderProduct object
+     *
+     * @param \Thelia\Model\OrderProduct|ObjectCollection $orderProduct The related object(s) to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function filterByOrderProduct($orderProduct, $comparison = null)
+    {
+        if ($orderProduct instanceof \Thelia\Model\OrderProduct) {
+            return $this
+                ->addUsingAlias(OrderProductAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProduct->getId(), $comparison);
+        } elseif ($orderProduct instanceof ObjectCollection) {
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+
+            return $this
+                ->addUsingAlias(OrderProductAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProduct->toKeyValue('PrimaryKey', 'Id'), $comparison);
+        } else {
+            throw new PropelException('filterByOrderProduct() only accepts arguments of type \Thelia\Model\OrderProduct or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the OrderProduct relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function joinOrderProduct($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('OrderProduct');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'OrderProduct');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the OrderProduct relation OrderProduct object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return   \Thelia\Model\OrderProductQuery A secondary query class using the current class as primary query
+     */
+    public function useOrderProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        return $this
+            ->joinOrderProduct($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'OrderProduct', '\Thelia\Model\OrderProductQuery');
+    }
+
+    /**
+     * Exclude object from result
+     *
+     * @param   ChildOrderProductAttributeCombination $orderProductAttributeCombination Object to remove from the list of results
+     *
+     * @return ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function prune($orderProductAttributeCombination = null)
+    {
+        if ($orderProductAttributeCombination) {
+            $this->addUsingAlias(OrderProductAttributeCombinationTableMap::ID, $orderProductAttributeCombination->getId(), Criteria::NOT_EQUAL);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Deletes all rows from the order_product_attribute_combination table.
+     *
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).
+     */
+    public function doDeleteAll(ConnectionInterface $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductAttributeCombinationTableMap::DATABASE_NAME);
+        }
+        $affectedRows = 0; // initialize var to track total num of affected rows
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table or we could emulating ON DELETE CASCADE, etc.
+            $con->beginTransaction();
+            $affectedRows += parent::doDeleteAll($con);
+            // Because this db requires some delete cascade/set null emulation, we have to
+            // clear the cached instance *after* the emulation has happened (since
+            // instances get re-added by the select statement contained therein).
+            OrderProductAttributeCombinationTableMap::clearInstancePool();
+            OrderProductAttributeCombinationTableMap::clearRelatedInstancePool();
+
+            $con->commit();
+        } catch (PropelException $e) {
+            $con->rollBack();
+            throw $e;
+        }
+
+        return $affectedRows;
+    }
+
+    /**
+     * Performs a DELETE on the database, given a ChildOrderProductAttributeCombination or Criteria object OR a primary key value.
+     *
+     * @param mixed               $values Criteria or ChildOrderProductAttributeCombination object or primary key or array of primary keys
+     *              which is used to create the DELETE statement
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     *                if supported by native driver or if emulated using Propel.
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+     public function delete(ConnectionInterface $con = null)
+     {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductAttributeCombinationTableMap::DATABASE_NAME);
+        }
+
+        $criteria = $this;
+
+        // Set the correct dbName
+        $criteria->setDbName(OrderProductAttributeCombinationTableMap::DATABASE_NAME);
+
+        $affectedRows = 0; // initialize var to track total num of affected rows
+
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table or we could emulating ON DELETE CASCADE, etc.
+            $con->beginTransaction();
+
+
+        OrderProductAttributeCombinationTableMap::removeInstanceFromPool($criteria);
+
+            $affectedRows += ModelCriteria::delete($con);
+            OrderProductAttributeCombinationTableMap::clearRelatedInstancePool();
+            $con->commit();
+
+            return $affectedRows;
+        } catch (PropelException $e) {
+            $con->rollBack();
+            throw $e;
+        }
+    }
+
+    // timestampable behavior
+
+    /**
+     * Filter by the latest updated
+     *
+     * @param      int $nbDays Maximum age of the latest update in days
+     *
+     * @return     ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function recentlyUpdated($nbDays = 7)
+    {
+        return $this->addUsingAlias(OrderProductAttributeCombinationTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+    }
+
+    /**
+     * Filter by the latest created
+     *
+     * @param      int $nbDays Maximum age of in days
+     *
+     * @return     ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function recentlyCreated($nbDays = 7)
+    {
+        return $this->addUsingAlias(OrderProductAttributeCombinationTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+    }
+
+    /**
+     * Order by update date desc
+     *
+     * @return     ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function lastUpdatedFirst()
+    {
+        return $this->addDescendingOrderByColumn(OrderProductAttributeCombinationTableMap::UPDATED_AT);
+    }
+
+    /**
+     * Order by update date asc
+     *
+     * @return     ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function firstUpdatedFirst()
+    {
+        return $this->addAscendingOrderByColumn(OrderProductAttributeCombinationTableMap::UPDATED_AT);
+    }
+
+    /**
+     * Order by create date desc
+     *
+     * @return     ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function lastCreatedFirst()
+    {
+        return $this->addDescendingOrderByColumn(OrderProductAttributeCombinationTableMap::CREATED_AT);
+    }
+
+    /**
+     * Order by create date asc
+     *
+     * @return     ChildOrderProductAttributeCombinationQuery The current query, for fluid interface
+     */
+    public function firstCreatedFirst()
+    {
+        return $this->addAscendingOrderByColumn(OrderProductAttributeCombinationTableMap::CREATED_AT);
+    }
+
+} // OrderProductAttributeCombinationQuery
diff --git a/core/lib/Thelia/Model/Base/OrderProductTax.php b/core/lib/Thelia/Model/Base/OrderProductTax.php
new file mode 100644
index 000000000..544755ff4
--- /dev/null
+++ b/core/lib/Thelia/Model/Base/OrderProductTax.php
@@ -0,0 +1,1534 @@
+<?php
+
+namespace Thelia\Model\Base;
+
+use \DateTime;
+use \Exception;
+use \PDO;
+use Propel\Runtime\Propel;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
+use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
+use Propel\Runtime\Collection\Collection;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Exception\BadMethodCallException;
+use Propel\Runtime\Exception\PropelException;
+use Propel\Runtime\Map\TableMap;
+use Propel\Runtime\Parser\AbstractParser;
+use Propel\Runtime\Util\PropelDateTime;
+use Thelia\Model\OrderProduct as ChildOrderProduct;
+use Thelia\Model\OrderProductQuery as ChildOrderProductQuery;
+use Thelia\Model\OrderProductTax as ChildOrderProductTax;
+use Thelia\Model\OrderProductTaxQuery as ChildOrderProductTaxQuery;
+use Thelia\Model\Map\OrderProductTaxTableMap;
+
+abstract class OrderProductTax implements ActiveRecordInterface
+{
+    /**
+     * TableMap class name
+     */
+    const TABLE_MAP = '\\Thelia\\Model\\Map\\OrderProductTaxTableMap';
+
+
+    /**
+     * attribute to determine if this object has previously been saved.
+     * @var boolean
+     */
+    protected $new = true;
+
+    /**
+     * attribute to determine whether this object has been deleted.
+     * @var boolean
+     */
+    protected $deleted = false;
+
+    /**
+     * The columns that have been modified in current object.
+     * Tracking modified columns allows us to only update modified columns.
+     * @var array
+     */
+    protected $modifiedColumns = array();
+
+    /**
+     * The (virtual) columns that are added at runtime
+     * The formatters can add supplementary columns based on a resultset
+     * @var array
+     */
+    protected $virtualColumns = array();
+
+    /**
+     * The value for the id field.
+     * @var        int
+     */
+    protected $id;
+
+    /**
+     * The value for the order_product_id field.
+     * @var        int
+     */
+    protected $order_product_id;
+
+    /**
+     * The value for the title field.
+     * @var        string
+     */
+    protected $title;
+
+    /**
+     * The value for the description field.
+     * @var        string
+     */
+    protected $description;
+
+    /**
+     * The value for the amount field.
+     * @var        double
+     */
+    protected $amount;
+
+    /**
+     * The value for the created_at field.
+     * @var        string
+     */
+    protected $created_at;
+
+    /**
+     * The value for the updated_at field.
+     * @var        string
+     */
+    protected $updated_at;
+
+    /**
+     * @var        OrderProduct
+     */
+    protected $aOrderProduct;
+
+    /**
+     * Flag to prevent endless save loop, if this object is referenced
+     * by another object which falls in this transaction.
+     *
+     * @var boolean
+     */
+    protected $alreadyInSave = false;
+
+    /**
+     * Initializes internal state of Thelia\Model\Base\OrderProductTax object.
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Returns whether the object has been modified.
+     *
+     * @return boolean True if the object has been modified.
+     */
+    public function isModified()
+    {
+        return !empty($this->modifiedColumns);
+    }
+
+    /**
+     * Has specified column been modified?
+     *
+     * @param  string  $col column fully qualified name (TableMap::TYPE_COLNAME), e.g. Book::AUTHOR_ID
+     * @return boolean True if $col has been modified.
+     */
+    public function isColumnModified($col)
+    {
+        return in_array($col, $this->modifiedColumns);
+    }
+
+    /**
+     * Get the columns that have been modified in this object.
+     * @return array A unique list of the modified column names for this object.
+     */
+    public function getModifiedColumns()
+    {
+        return array_unique($this->modifiedColumns);
+    }
+
+    /**
+     * Returns whether the object has ever been saved.  This will
+     * be false, if the object was retrieved from storage or was created
+     * and then saved.
+     *
+     * @return true, if the object has never been persisted.
+     */
+    public function isNew()
+    {
+        return $this->new;
+    }
+
+    /**
+     * Setter for the isNew attribute.  This method will be called
+     * by Propel-generated children and objects.
+     *
+     * @param boolean $b the state of the object.
+     */
+    public function setNew($b)
+    {
+        $this->new = (Boolean) $b;
+    }
+
+    /**
+     * Whether this object has been deleted.
+     * @return boolean The deleted state of this object.
+     */
+    public function isDeleted()
+    {
+        return $this->deleted;
+    }
+
+    /**
+     * Specify whether this object has been deleted.
+     * @param  boolean $b The deleted state of this object.
+     * @return void
+     */
+    public function setDeleted($b)
+    {
+        $this->deleted = (Boolean) $b;
+    }
+
+    /**
+     * Sets the modified state for the object to be false.
+     * @param  string $col If supplied, only the specified column is reset.
+     * @return void
+     */
+    public function resetModified($col = null)
+    {
+        if (null !== $col) {
+            while (false !== ($offset = array_search($col, $this->modifiedColumns))) {
+                array_splice($this->modifiedColumns, $offset, 1);
+            }
+        } else {
+            $this->modifiedColumns = array();
+        }
+    }
+
+    /**
+     * Compares this with another <code>OrderProductTax</code> instance.  If
+     * <code>obj</code> is an instance of <code>OrderProductTax</code>, delegates to
+     * <code>equals(OrderProductTax)</code>.  Otherwise, returns <code>false</code>.
+     *
+     * @param      obj The object to compare to.
+     * @return Whether equal to the object specified.
+     */
+    public function equals($obj)
+    {
+        $thisclazz = get_class($this);
+        if (!is_object($obj) || !($obj instanceof $thisclazz)) {
+            return false;
+        }
+
+        if ($this === $obj) {
+            return true;
+        }
+
+        if (null === $this->getPrimaryKey()
+            || null === $obj->getPrimaryKey())  {
+            return false;
+        }
+
+        return $this->getPrimaryKey() === $obj->getPrimaryKey();
+    }
+
+    /**
+     * If the primary key is not null, return the hashcode of the
+     * primary key. Otherwise, return the hash code of the object.
+     *
+     * @return int Hashcode
+     */
+    public function hashCode()
+    {
+        if (null !== $this->getPrimaryKey()) {
+            return crc32(serialize($this->getPrimaryKey()));
+        }
+
+        return crc32(serialize(clone $this));
+    }
+
+    /**
+     * Get the associative array of the virtual columns in this object
+     *
+     * @param string $name The virtual column name
+     *
+     * @return array
+     */
+    public function getVirtualColumns()
+    {
+        return $this->virtualColumns;
+    }
+
+    /**
+     * Checks the existence of a virtual column in this object
+     *
+     * @return boolean
+     */
+    public function hasVirtualColumn($name)
+    {
+        return array_key_exists($name, $this->virtualColumns);
+    }
+
+    /**
+     * Get the value of a virtual column in this object
+     *
+     * @return mixed
+     */
+    public function getVirtualColumn($name)
+    {
+        if (!$this->hasVirtualColumn($name)) {
+            throw new PropelException(sprintf('Cannot get value of inexistent virtual column %s.', $name));
+        }
+
+        return $this->virtualColumns[$name];
+    }
+
+    /**
+     * Set the value of a virtual column in this object
+     *
+     * @param string $name  The virtual column name
+     * @param mixed  $value The value to give to the virtual column
+     *
+     * @return OrderProductTax The current object, for fluid interface
+     */
+    public function setVirtualColumn($name, $value)
+    {
+        $this->virtualColumns[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Logs a message using Propel::log().
+     *
+     * @param  string  $msg
+     * @param  int     $priority One of the Propel::LOG_* logging levels
+     * @return boolean
+     */
+    protected function log($msg, $priority = Propel::LOG_INFO)
+    {
+        return Propel::log(get_class($this) . ': ' . $msg, $priority);
+    }
+
+    /**
+     * Populate the current object from a string, using a given parser format
+     * <code>
+     * $book = new Book();
+     * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
+     * </code>
+     *
+     * @param mixed $parser A AbstractParser instance,
+     *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
+     * @param string $data The source data to import from
+     *
+     * @return OrderProductTax The current object, for fluid interface
+     */
+    public function importFrom($parser, $data)
+    {
+        if (!$parser instanceof AbstractParser) {
+            $parser = AbstractParser::getParser($parser);
+        }
+
+        return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME);
+    }
+
+    /**
+     * Export the current object properties to a string, using a given parser format
+     * <code>
+     * $book = BookQuery::create()->findPk(9012);
+     * echo $book->exportTo('JSON');
+     *  => {"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
+     * </code>
+     *
+     * @param  mixed   $parser                 A AbstractParser instance, or a format name ('XML', 'YAML', 'JSON', 'CSV')
+     * @param  boolean $includeLazyLoadColumns (optional) Whether to include lazy load(ed) columns. Defaults to TRUE.
+     * @return string  The exported data
+     */
+    public function exportTo($parser, $includeLazyLoadColumns = true)
+    {
+        if (!$parser instanceof AbstractParser) {
+            $parser = AbstractParser::getParser($parser);
+        }
+
+        return $parser->fromArray($this->toArray(TableMap::TYPE_PHPNAME, $includeLazyLoadColumns, array(), true));
+    }
+
+    /**
+     * Clean up internal collections prior to serializing
+     * Avoids recursive loops that turn into segmentation faults when serializing
+     */
+    public function __sleep()
+    {
+        $this->clearAllReferences();
+
+        return array_keys(get_object_vars($this));
+    }
+
+    /**
+     * Get the [id] column value.
+     *
+     * @return   int
+     */
+    public function getId()
+    {
+
+        return $this->id;
+    }
+
+    /**
+     * Get the [order_product_id] column value.
+     *
+     * @return   int
+     */
+    public function getOrderProductId()
+    {
+
+        return $this->order_product_id;
+    }
+
+    /**
+     * Get the [title] column value.
+     *
+     * @return   string
+     */
+    public function getTitle()
+    {
+
+        return $this->title;
+    }
+
+    /**
+     * Get the [description] column value.
+     *
+     * @return   string
+     */
+    public function getDescription()
+    {
+
+        return $this->description;
+    }
+
+    /**
+     * Get the [amount] column value.
+     *
+     * @return   double
+     */
+    public function getAmount()
+    {
+
+        return $this->amount;
+    }
+
+    /**
+     * Get the [optionally formatted] temporal [created_at] column value.
+     *
+     *
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
+     *                            If format is NULL, then the raw \DateTime object will be returned.
+     *
+     * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
+     *
+     * @throws PropelException - if unable to parse/validate the date/time value.
+     */
+    public function getCreatedAt($format = NULL)
+    {
+        if ($format === null) {
+            return $this->created_at;
+        } else {
+            return $this->created_at !== null ? $this->created_at->format($format) : null;
+        }
+    }
+
+    /**
+     * Get the [optionally formatted] temporal [updated_at] column value.
+     *
+     *
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
+     *                            If format is NULL, then the raw \DateTime object will be returned.
+     *
+     * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
+     *
+     * @throws PropelException - if unable to parse/validate the date/time value.
+     */
+    public function getUpdatedAt($format = NULL)
+    {
+        if ($format === null) {
+            return $this->updated_at;
+        } else {
+            return $this->updated_at !== null ? $this->updated_at->format($format) : null;
+        }
+    }
+
+    /**
+     * Set the value of [id] column.
+     *
+     * @param      int $v new value
+     * @return   \Thelia\Model\OrderProductTax The current object (for fluent API support)
+     */
+    public function setId($v)
+    {
+        if ($v !== null) {
+            $v = (int) $v;
+        }
+
+        if ($this->id !== $v) {
+            $this->id = $v;
+            $this->modifiedColumns[] = OrderProductTaxTableMap::ID;
+        }
+
+
+        return $this;
+    } // setId()
+
+    /**
+     * Set the value of [order_product_id] column.
+     *
+     * @param      int $v new value
+     * @return   \Thelia\Model\OrderProductTax The current object (for fluent API support)
+     */
+    public function setOrderProductId($v)
+    {
+        if ($v !== null) {
+            $v = (int) $v;
+        }
+
+        if ($this->order_product_id !== $v) {
+            $this->order_product_id = $v;
+            $this->modifiedColumns[] = OrderProductTaxTableMap::ORDER_PRODUCT_ID;
+        }
+
+        if ($this->aOrderProduct !== null && $this->aOrderProduct->getId() !== $v) {
+            $this->aOrderProduct = null;
+        }
+
+
+        return $this;
+    } // setOrderProductId()
+
+    /**
+     * Set the value of [title] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProductTax The current object (for fluent API support)
+     */
+    public function setTitle($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->title !== $v) {
+            $this->title = $v;
+            $this->modifiedColumns[] = OrderProductTaxTableMap::TITLE;
+        }
+
+
+        return $this;
+    } // setTitle()
+
+    /**
+     * Set the value of [description] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProductTax The current object (for fluent API support)
+     */
+    public function setDescription($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->description !== $v) {
+            $this->description = $v;
+            $this->modifiedColumns[] = OrderProductTaxTableMap::DESCRIPTION;
+        }
+
+
+        return $this;
+    } // setDescription()
+
+    /**
+     * Set the value of [amount] column.
+     *
+     * @param      double $v new value
+     * @return   \Thelia\Model\OrderProductTax The current object (for fluent API support)
+     */
+    public function setAmount($v)
+    {
+        if ($v !== null) {
+            $v = (double) $v;
+        }
+
+        if ($this->amount !== $v) {
+            $this->amount = $v;
+            $this->modifiedColumns[] = OrderProductTaxTableMap::AMOUNT;
+        }
+
+
+        return $this;
+    } // setAmount()
+
+    /**
+     * Sets the value of [created_at] column to a normalized version of the date/time value specified.
+     *
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
+     *               Empty strings are treated as NULL.
+     * @return   \Thelia\Model\OrderProductTax The current object (for fluent API support)
+     */
+    public function setCreatedAt($v)
+    {
+        $dt = PropelDateTime::newInstance($v, null, '\DateTime');
+        if ($this->created_at !== null || $dt !== null) {
+            if ($dt !== $this->created_at) {
+                $this->created_at = $dt;
+                $this->modifiedColumns[] = OrderProductTaxTableMap::CREATED_AT;
+            }
+        } // if either are not null
+
+
+        return $this;
+    } // setCreatedAt()
+
+    /**
+     * Sets the value of [updated_at] column to a normalized version of the date/time value specified.
+     *
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
+     *               Empty strings are treated as NULL.
+     * @return   \Thelia\Model\OrderProductTax The current object (for fluent API support)
+     */
+    public function setUpdatedAt($v)
+    {
+        $dt = PropelDateTime::newInstance($v, null, '\DateTime');
+        if ($this->updated_at !== null || $dt !== null) {
+            if ($dt !== $this->updated_at) {
+                $this->updated_at = $dt;
+                $this->modifiedColumns[] = OrderProductTaxTableMap::UPDATED_AT;
+            }
+        } // if either are not null
+
+
+        return $this;
+    } // setUpdatedAt()
+
+    /**
+     * Indicates whether the columns in this object are only set to default values.
+     *
+     * This method can be used in conjunction with isModified() to indicate whether an object is both
+     * modified _and_ has some values set which are non-default.
+     *
+     * @return boolean Whether the columns in this object are only been set with default values.
+     */
+    public function hasOnlyDefaultValues()
+    {
+        // otherwise, everything was equal, so return TRUE
+        return true;
+    } // hasOnlyDefaultValues()
+
+    /**
+     * Hydrates (populates) the object variables with values from the database resultset.
+     *
+     * An offset (0-based "start column") is specified so that objects can be hydrated
+     * with a subset of the columns in the resultset rows.  This is needed, for example,
+     * for results of JOIN queries where the resultset row includes columns from two or
+     * more tables.
+     *
+     * @param array   $row       The row returned by DataFetcher->fetch().
+     * @param int     $startcol  0-based offset column which indicates which restultset column to start with.
+     * @param boolean $rehydrate Whether this object is being re-hydrated from the database.
+     * @param string  $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+                                  One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                            TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *
+     * @return int             next starting column
+     * @throws PropelException - Any caught Exception will be rewrapped as a PropelException.
+     */
+    public function hydrate($row, $startcol = 0, $rehydrate = false, $indexType = TableMap::TYPE_NUM)
+    {
+        try {
+
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : OrderProductTaxTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->id = (null !== $col) ? (int) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : OrderProductTaxTableMap::translateFieldName('OrderProductId', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->order_product_id = (null !== $col) ? (int) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : OrderProductTaxTableMap::translateFieldName('Title', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->title = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : OrderProductTaxTableMap::translateFieldName('Description', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->description = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : OrderProductTaxTableMap::translateFieldName('Amount', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->amount = (null !== $col) ? (double) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : OrderProductTaxTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            if ($col === '0000-00-00 00:00:00') {
+                $col = null;
+            }
+            $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : OrderProductTaxTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            if ($col === '0000-00-00 00:00:00') {
+                $col = null;
+            }
+            $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
+            $this->resetModified();
+
+            $this->setNew(false);
+
+            if ($rehydrate) {
+                $this->ensureConsistency();
+            }
+
+            return $startcol + 7; // 7 = OrderProductTaxTableMap::NUM_HYDRATE_COLUMNS.
+
+        } catch (Exception $e) {
+            throw new PropelException("Error populating \Thelia\Model\OrderProductTax object", 0, $e);
+        }
+    }
+
+    /**
+     * Checks and repairs the internal consistency of the object.
+     *
+     * This method is executed after an already-instantiated object is re-hydrated
+     * from the database.  It exists to check any foreign keys to make sure that
+     * the objects related to the current object are correct based on foreign key.
+     *
+     * You can override this method in the stub class, but you should always invoke
+     * the base method from the overridden method (i.e. parent::ensureConsistency()),
+     * in case your model changes.
+     *
+     * @throws PropelException
+     */
+    public function ensureConsistency()
+    {
+        if ($this->aOrderProduct !== null && $this->order_product_id !== $this->aOrderProduct->getId()) {
+            $this->aOrderProduct = null;
+        }
+    } // ensureConsistency
+
+    /**
+     * Reloads this object from datastore based on primary key and (optionally) resets all associated objects.
+     *
+     * This will only work if the object has been saved and has a valid primary key set.
+     *
+     * @param      boolean $deep (optional) Whether to also de-associated any related objects.
+     * @param      ConnectionInterface $con (optional) The ConnectionInterface connection to use.
+     * @return void
+     * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db
+     */
+    public function reload($deep = false, ConnectionInterface $con = null)
+    {
+        if ($this->isDeleted()) {
+            throw new PropelException("Cannot reload a deleted object.");
+        }
+
+        if ($this->isNew()) {
+            throw new PropelException("Cannot reload an unsaved object.");
+        }
+
+        if ($con === null) {
+            $con = Propel::getServiceContainer()->getReadConnection(OrderProductTaxTableMap::DATABASE_NAME);
+        }
+
+        // We don't need to alter the object instance pool; we're just modifying this instance
+        // already in the pool.
+
+        $dataFetcher = ChildOrderProductTaxQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con);
+        $row = $dataFetcher->fetch();
+        $dataFetcher->close();
+        if (!$row) {
+            throw new PropelException('Cannot find matching row in the database to reload object values.');
+        }
+        $this->hydrate($row, 0, true, $dataFetcher->getIndexType()); // rehydrate
+
+        if ($deep) {  // also de-associate any related objects?
+
+            $this->aOrderProduct = null;
+        } // if (deep)
+    }
+
+    /**
+     * Removes this object from datastore and sets delete attribute.
+     *
+     * @param      ConnectionInterface $con
+     * @return void
+     * @throws PropelException
+     * @see OrderProductTax::setDeleted()
+     * @see OrderProductTax::isDeleted()
+     */
+    public function delete(ConnectionInterface $con = null)
+    {
+        if ($this->isDeleted()) {
+            throw new PropelException("This object has already been deleted.");
+        }
+
+        if ($con === null) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductTaxTableMap::DATABASE_NAME);
+        }
+
+        $con->beginTransaction();
+        try {
+            $deleteQuery = ChildOrderProductTaxQuery::create()
+                ->filterByPrimaryKey($this->getPrimaryKey());
+            $ret = $this->preDelete($con);
+            if ($ret) {
+                $deleteQuery->delete($con);
+                $this->postDelete($con);
+                $con->commit();
+                $this->setDeleted(true);
+            } else {
+                $con->commit();
+            }
+        } catch (Exception $e) {
+            $con->rollBack();
+            throw $e;
+        }
+    }
+
+    /**
+     * Persists this object to the database.
+     *
+     * If the object is new, it inserts it; otherwise an update is performed.
+     * All modified related objects will also be persisted in the doSave()
+     * method.  This method wraps all precipitate database operations in a
+     * single transaction.
+     *
+     * @param      ConnectionInterface $con
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @throws PropelException
+     * @see doSave()
+     */
+    public function save(ConnectionInterface $con = null)
+    {
+        if ($this->isDeleted()) {
+            throw new PropelException("You cannot save an object that has been deleted.");
+        }
+
+        if ($con === null) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductTaxTableMap::DATABASE_NAME);
+        }
+
+        $con->beginTransaction();
+        $isInsert = $this->isNew();
+        try {
+            $ret = $this->preSave($con);
+            if ($isInsert) {
+                $ret = $ret && $this->preInsert($con);
+                // timestampable behavior
+                if (!$this->isColumnModified(OrderProductTaxTableMap::CREATED_AT)) {
+                    $this->setCreatedAt(time());
+                }
+                if (!$this->isColumnModified(OrderProductTaxTableMap::UPDATED_AT)) {
+                    $this->setUpdatedAt(time());
+                }
+            } else {
+                $ret = $ret && $this->preUpdate($con);
+                // timestampable behavior
+                if ($this->isModified() && !$this->isColumnModified(OrderProductTaxTableMap::UPDATED_AT)) {
+                    $this->setUpdatedAt(time());
+                }
+            }
+            if ($ret) {
+                $affectedRows = $this->doSave($con);
+                if ($isInsert) {
+                    $this->postInsert($con);
+                } else {
+                    $this->postUpdate($con);
+                }
+                $this->postSave($con);
+                OrderProductTaxTableMap::addInstanceToPool($this);
+            } else {
+                $affectedRows = 0;
+            }
+            $con->commit();
+
+            return $affectedRows;
+        } catch (Exception $e) {
+            $con->rollBack();
+            throw $e;
+        }
+    }
+
+    /**
+     * Performs the work of inserting or updating the row in the database.
+     *
+     * If the object is new, it inserts it; otherwise an update is performed.
+     * All related objects are also updated in this method.
+     *
+     * @param      ConnectionInterface $con
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @throws PropelException
+     * @see save()
+     */
+    protected function doSave(ConnectionInterface $con)
+    {
+        $affectedRows = 0; // initialize var to track total num of affected rows
+        if (!$this->alreadyInSave) {
+            $this->alreadyInSave = true;
+
+            // We call the save method on the following object(s) if they
+            // were passed to this object by their corresponding set
+            // method.  This object relates to these object(s) by a
+            // foreign key reference.
+
+            if ($this->aOrderProduct !== null) {
+                if ($this->aOrderProduct->isModified() || $this->aOrderProduct->isNew()) {
+                    $affectedRows += $this->aOrderProduct->save($con);
+                }
+                $this->setOrderProduct($this->aOrderProduct);
+            }
+
+            if ($this->isNew() || $this->isModified()) {
+                // persist changes
+                if ($this->isNew()) {
+                    $this->doInsert($con);
+                } else {
+                    $this->doUpdate($con);
+                }
+                $affectedRows += 1;
+                $this->resetModified();
+            }
+
+            $this->alreadyInSave = false;
+
+        }
+
+        return $affectedRows;
+    } // doSave()
+
+    /**
+     * Insert the row in the database.
+     *
+     * @param      ConnectionInterface $con
+     *
+     * @throws PropelException
+     * @see doSave()
+     */
+    protected function doInsert(ConnectionInterface $con)
+    {
+        $modifiedColumns = array();
+        $index = 0;
+
+        $this->modifiedColumns[] = OrderProductTaxTableMap::ID;
+        if (null !== $this->id) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key (' . OrderProductTaxTableMap::ID . ')');
+        }
+
+         // check the columns in natural order for more readable SQL queries
+        if ($this->isColumnModified(OrderProductTaxTableMap::ID)) {
+            $modifiedColumns[':p' . $index++]  = 'ID';
+        }
+        if ($this->isColumnModified(OrderProductTaxTableMap::ORDER_PRODUCT_ID)) {
+            $modifiedColumns[':p' . $index++]  = 'ORDER_PRODUCT_ID';
+        }
+        if ($this->isColumnModified(OrderProductTaxTableMap::TITLE)) {
+            $modifiedColumns[':p' . $index++]  = 'TITLE';
+        }
+        if ($this->isColumnModified(OrderProductTaxTableMap::DESCRIPTION)) {
+            $modifiedColumns[':p' . $index++]  = 'DESCRIPTION';
+        }
+        if ($this->isColumnModified(OrderProductTaxTableMap::AMOUNT)) {
+            $modifiedColumns[':p' . $index++]  = 'AMOUNT';
+        }
+        if ($this->isColumnModified(OrderProductTaxTableMap::CREATED_AT)) {
+            $modifiedColumns[':p' . $index++]  = 'CREATED_AT';
+        }
+        if ($this->isColumnModified(OrderProductTaxTableMap::UPDATED_AT)) {
+            $modifiedColumns[':p' . $index++]  = 'UPDATED_AT';
+        }
+
+        $sql = sprintf(
+            'INSERT INTO order_product_tax (%s) VALUES (%s)',
+            implode(', ', $modifiedColumns),
+            implode(', ', array_keys($modifiedColumns))
+        );
+
+        try {
+            $stmt = $con->prepare($sql);
+            foreach ($modifiedColumns as $identifier => $columnName) {
+                switch ($columnName) {
+                    case 'ID':
+                        $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
+                        break;
+                    case 'ORDER_PRODUCT_ID':
+                        $stmt->bindValue($identifier, $this->order_product_id, PDO::PARAM_INT);
+                        break;
+                    case 'TITLE':
+                        $stmt->bindValue($identifier, $this->title, PDO::PARAM_STR);
+                        break;
+                    case 'DESCRIPTION':
+                        $stmt->bindValue($identifier, $this->description, PDO::PARAM_STR);
+                        break;
+                    case 'AMOUNT':
+                        $stmt->bindValue($identifier, $this->amount, PDO::PARAM_STR);
+                        break;
+                    case 'CREATED_AT':
+                        $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
+                        break;
+                    case 'UPDATED_AT':
+                        $stmt->bindValue($identifier, $this->updated_at ? $this->updated_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
+                        break;
+                }
+            }
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e);
+        }
+
+        try {
+            $pk = $con->lastInsertId();
+        } catch (Exception $e) {
+            throw new PropelException('Unable to get autoincrement id.', 0, $e);
+        }
+        $this->setId($pk);
+
+        $this->setNew(false);
+    }
+
+    /**
+     * Update the row in the database.
+     *
+     * @param      ConnectionInterface $con
+     *
+     * @return Integer Number of updated rows
+     * @see doSave()
+     */
+    protected function doUpdate(ConnectionInterface $con)
+    {
+        $selectCriteria = $this->buildPkeyCriteria();
+        $valuesCriteria = $this->buildCriteria();
+
+        return $selectCriteria->doUpdate($valuesCriteria, $con);
+    }
+
+    /**
+     * Retrieves a field from the object by name passed in as a string.
+     *
+     * @param      string $name name
+     * @param      string $type The type of fieldname the $name is of:
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
+     * @return mixed Value of field.
+     */
+    public function getByName($name, $type = TableMap::TYPE_PHPNAME)
+    {
+        $pos = OrderProductTaxTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
+        $field = $this->getByPosition($pos);
+
+        return $field;
+    }
+
+    /**
+     * Retrieves a field from the object by Position as specified in the xml schema.
+     * Zero-based.
+     *
+     * @param      int $pos position in xml schema
+     * @return mixed Value of field at $pos
+     */
+    public function getByPosition($pos)
+    {
+        switch ($pos) {
+            case 0:
+                return $this->getId();
+                break;
+            case 1:
+                return $this->getOrderProductId();
+                break;
+            case 2:
+                return $this->getTitle();
+                break;
+            case 3:
+                return $this->getDescription();
+                break;
+            case 4:
+                return $this->getAmount();
+                break;
+            case 5:
+                return $this->getCreatedAt();
+                break;
+            case 6:
+                return $this->getUpdatedAt();
+                break;
+            default:
+                return null;
+                break;
+        } // switch()
+    }
+
+    /**
+     * Exports the object as an array.
+     *
+     * You can specify the key type of the array by passing one of the class
+     * type constants.
+     *
+     * @param     string  $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+     *                    TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                    Defaults to TableMap::TYPE_PHPNAME.
+     * @param     boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
+     * @param     array $alreadyDumpedObjects List of objects to skip to avoid recursion
+     * @param     boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE.
+     *
+     * @return array an associative array containing the field names (as keys) and field values
+     */
+    public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false)
+    {
+        if (isset($alreadyDumpedObjects['OrderProductTax'][$this->getPrimaryKey()])) {
+            return '*RECURSION*';
+        }
+        $alreadyDumpedObjects['OrderProductTax'][$this->getPrimaryKey()] = true;
+        $keys = OrderProductTaxTableMap::getFieldNames($keyType);
+        $result = array(
+            $keys[0] => $this->getId(),
+            $keys[1] => $this->getOrderProductId(),
+            $keys[2] => $this->getTitle(),
+            $keys[3] => $this->getDescription(),
+            $keys[4] => $this->getAmount(),
+            $keys[5] => $this->getCreatedAt(),
+            $keys[6] => $this->getUpdatedAt(),
+        );
+        $virtualColumns = $this->virtualColumns;
+        foreach($virtualColumns as $key => $virtualColumn)
+        {
+            $result[$key] = $virtualColumn;
+        }
+
+        if ($includeForeignObjects) {
+            if (null !== $this->aOrderProduct) {
+                $result['OrderProduct'] = $this->aOrderProduct->toArray($keyType, $includeLazyLoadColumns,  $alreadyDumpedObjects, true);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Sets a field from the object by name passed in as a string.
+     *
+     * @param      string $name
+     * @param      mixed  $value field value
+     * @param      string $type The type of fieldname the $name is of:
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
+     * @return void
+     */
+    public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
+    {
+        $pos = OrderProductTaxTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
+
+        return $this->setByPosition($pos, $value);
+    }
+
+    /**
+     * Sets a field from the object by Position as specified in the xml schema.
+     * Zero-based.
+     *
+     * @param      int $pos position in xml schema
+     * @param      mixed $value field value
+     * @return void
+     */
+    public function setByPosition($pos, $value)
+    {
+        switch ($pos) {
+            case 0:
+                $this->setId($value);
+                break;
+            case 1:
+                $this->setOrderProductId($value);
+                break;
+            case 2:
+                $this->setTitle($value);
+                break;
+            case 3:
+                $this->setDescription($value);
+                break;
+            case 4:
+                $this->setAmount($value);
+                break;
+            case 5:
+                $this->setCreatedAt($value);
+                break;
+            case 6:
+                $this->setUpdatedAt($value);
+                break;
+        } // switch()
+    }
+
+    /**
+     * Populates the object using an array.
+     *
+     * This is particularly useful when populating an object from one of the
+     * request arrays (e.g. $_POST).  This method goes through the column
+     * names, checking to see whether a matching key exists in populated
+     * array. If so the setByName() method is called for that column.
+     *
+     * You can specify the key type of the array by additionally passing one
+     * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+     * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     * The default key type is the column's TableMap::TYPE_PHPNAME.
+     *
+     * @param      array  $arr     An array to populate the object from.
+     * @param      string $keyType The type of keys the array uses.
+     * @return void
+     */
+    public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
+    {
+        $keys = OrderProductTaxTableMap::getFieldNames($keyType);
+
+        if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
+        if (array_key_exists($keys[1], $arr)) $this->setOrderProductId($arr[$keys[1]]);
+        if (array_key_exists($keys[2], $arr)) $this->setTitle($arr[$keys[2]]);
+        if (array_key_exists($keys[3], $arr)) $this->setDescription($arr[$keys[3]]);
+        if (array_key_exists($keys[4], $arr)) $this->setAmount($arr[$keys[4]]);
+        if (array_key_exists($keys[5], $arr)) $this->setCreatedAt($arr[$keys[5]]);
+        if (array_key_exists($keys[6], $arr)) $this->setUpdatedAt($arr[$keys[6]]);
+    }
+
+    /**
+     * Build a Criteria object containing the values of all modified columns in this object.
+     *
+     * @return Criteria The Criteria object containing all modified values.
+     */
+    public function buildCriteria()
+    {
+        $criteria = new Criteria(OrderProductTaxTableMap::DATABASE_NAME);
+
+        if ($this->isColumnModified(OrderProductTaxTableMap::ID)) $criteria->add(OrderProductTaxTableMap::ID, $this->id);
+        if ($this->isColumnModified(OrderProductTaxTableMap::ORDER_PRODUCT_ID)) $criteria->add(OrderProductTaxTableMap::ORDER_PRODUCT_ID, $this->order_product_id);
+        if ($this->isColumnModified(OrderProductTaxTableMap::TITLE)) $criteria->add(OrderProductTaxTableMap::TITLE, $this->title);
+        if ($this->isColumnModified(OrderProductTaxTableMap::DESCRIPTION)) $criteria->add(OrderProductTaxTableMap::DESCRIPTION, $this->description);
+        if ($this->isColumnModified(OrderProductTaxTableMap::AMOUNT)) $criteria->add(OrderProductTaxTableMap::AMOUNT, $this->amount);
+        if ($this->isColumnModified(OrderProductTaxTableMap::CREATED_AT)) $criteria->add(OrderProductTaxTableMap::CREATED_AT, $this->created_at);
+        if ($this->isColumnModified(OrderProductTaxTableMap::UPDATED_AT)) $criteria->add(OrderProductTaxTableMap::UPDATED_AT, $this->updated_at);
+
+        return $criteria;
+    }
+
+    /**
+     * Builds a Criteria object containing the primary key for this object.
+     *
+     * Unlike buildCriteria() this method includes the primary key values regardless
+     * of whether or not they have been modified.
+     *
+     * @return Criteria The Criteria object containing value(s) for primary key(s).
+     */
+    public function buildPkeyCriteria()
+    {
+        $criteria = new Criteria(OrderProductTaxTableMap::DATABASE_NAME);
+        $criteria->add(OrderProductTaxTableMap::ID, $this->id);
+
+        return $criteria;
+    }
+
+    /**
+     * Returns the primary key for this object (row).
+     * @return   int
+     */
+    public function getPrimaryKey()
+    {
+        return $this->getId();
+    }
+
+    /**
+     * Generic method to set the primary key (id column).
+     *
+     * @param       int $key Primary key.
+     * @return void
+     */
+    public function setPrimaryKey($key)
+    {
+        $this->setId($key);
+    }
+
+    /**
+     * Returns true if the primary key for this object is null.
+     * @return boolean
+     */
+    public function isPrimaryKeyNull()
+    {
+
+        return null === $this->getId();
+    }
+
+    /**
+     * Sets contents of passed object to values from current object.
+     *
+     * If desired, this method can also make copies of all associated (fkey referrers)
+     * objects.
+     *
+     * @param      object $copyObj An object of \Thelia\Model\OrderProductTax (or compatible) type.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $makeNew Whether to reset autoincrement PKs and make the object new.
+     * @throws PropelException
+     */
+    public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
+    {
+        $copyObj->setOrderProductId($this->getOrderProductId());
+        $copyObj->setTitle($this->getTitle());
+        $copyObj->setDescription($this->getDescription());
+        $copyObj->setAmount($this->getAmount());
+        $copyObj->setCreatedAt($this->getCreatedAt());
+        $copyObj->setUpdatedAt($this->getUpdatedAt());
+        if ($makeNew) {
+            $copyObj->setNew(true);
+            $copyObj->setId(NULL); // this is a auto-increment column, so set to default value
+        }
+    }
+
+    /**
+     * Makes a copy of this object that will be inserted as a new row in table when saved.
+     * It creates a new object filling in the simple attributes, but skipping any primary
+     * keys that are defined for the table.
+     *
+     * If desired, this method can also make copies of all associated (fkey referrers)
+     * objects.
+     *
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @return                 \Thelia\Model\OrderProductTax Clone of current object.
+     * @throws PropelException
+     */
+    public function copy($deepCopy = false)
+    {
+        // we use get_class(), because this might be a subclass
+        $clazz = get_class($this);
+        $copyObj = new $clazz();
+        $this->copyInto($copyObj, $deepCopy);
+
+        return $copyObj;
+    }
+
+    /**
+     * Declares an association between this object and a ChildOrderProduct object.
+     *
+     * @param                  ChildOrderProduct $v
+     * @return                 \Thelia\Model\OrderProductTax The current object (for fluent API support)
+     * @throws PropelException
+     */
+    public function setOrderProduct(ChildOrderProduct $v = null)
+    {
+        if ($v === null) {
+            $this->setOrderProductId(NULL);
+        } else {
+            $this->setOrderProductId($v->getId());
+        }
+
+        $this->aOrderProduct = $v;
+
+        // Add binding for other direction of this n:n relationship.
+        // If this object has already been added to the ChildOrderProduct object, it will not be re-added.
+        if ($v !== null) {
+            $v->addOrderProductTax($this);
+        }
+
+
+        return $this;
+    }
+
+
+    /**
+     * Get the associated ChildOrderProduct object
+     *
+     * @param      ConnectionInterface $con Optional Connection object.
+     * @return                 ChildOrderProduct The associated ChildOrderProduct object.
+     * @throws PropelException
+     */
+    public function getOrderProduct(ConnectionInterface $con = null)
+    {
+        if ($this->aOrderProduct === null && ($this->order_product_id !== null)) {
+            $this->aOrderProduct = ChildOrderProductQuery::create()->findPk($this->order_product_id, $con);
+            /* The following can be used additionally to
+                guarantee the related object contains a reference
+                to this object.  This level of coupling may, however, be
+                undesirable since it could result in an only partially populated collection
+                in the referenced object.
+                $this->aOrderProduct->addOrderProductTaxes($this);
+             */
+        }
+
+        return $this->aOrderProduct;
+    }
+
+    /**
+     * Clears the current object and sets all attributes to their default values
+     */
+    public function clear()
+    {
+        $this->id = null;
+        $this->order_product_id = null;
+        $this->title = null;
+        $this->description = null;
+        $this->amount = null;
+        $this->created_at = null;
+        $this->updated_at = null;
+        $this->alreadyInSave = false;
+        $this->clearAllReferences();
+        $this->resetModified();
+        $this->setNew(true);
+        $this->setDeleted(false);
+    }
+
+    /**
+     * Resets all references to other model objects or collections of model objects.
+     *
+     * This method is a user-space workaround for PHP's inability to garbage collect
+     * objects with circular references (even in PHP 5.3). This is currently necessary
+     * when using Propel in certain daemon or large-volume/high-memory operations.
+     *
+     * @param      boolean $deep Whether to also clear the references on all referrer objects.
+     */
+    public function clearAllReferences($deep = false)
+    {
+        if ($deep) {
+        } // if ($deep)
+
+        $this->aOrderProduct = null;
+    }
+
+    /**
+     * Return the string representation of this object
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return (string) $this->exportTo(OrderProductTaxTableMap::DEFAULT_STRING_FORMAT);
+    }
+
+    // timestampable behavior
+
+    /**
+     * Mark the current object so that the update date doesn't get updated during next save
+     *
+     * @return     ChildOrderProductTax The current object (for fluent API support)
+     */
+    public function keepUpdateDateUnchanged()
+    {
+        $this->modifiedColumns[] = OrderProductTaxTableMap::UPDATED_AT;
+
+        return $this;
+    }
+
+    /**
+     * Code to be run before persisting the object
+     * @param  ConnectionInterface $con
+     * @return boolean
+     */
+    public function preSave(ConnectionInterface $con = null)
+    {
+        return true;
+    }
+
+    /**
+     * Code to be run after persisting the object
+     * @param ConnectionInterface $con
+     */
+    public function postSave(ConnectionInterface $con = null)
+    {
+
+    }
+
+    /**
+     * Code to be run before inserting to database
+     * @param  ConnectionInterface $con
+     * @return boolean
+     */
+    public function preInsert(ConnectionInterface $con = null)
+    {
+        return true;
+    }
+
+    /**
+     * Code to be run after inserting to database
+     * @param ConnectionInterface $con
+     */
+    public function postInsert(ConnectionInterface $con = null)
+    {
+
+    }
+
+    /**
+     * Code to be run before updating the object in database
+     * @param  ConnectionInterface $con
+     * @return boolean
+     */
+    public function preUpdate(ConnectionInterface $con = null)
+    {
+        return true;
+    }
+
+    /**
+     * Code to be run after updating the object in database
+     * @param ConnectionInterface $con
+     */
+    public function postUpdate(ConnectionInterface $con = null)
+    {
+
+    }
+
+    /**
+     * Code to be run before deleting the object in database
+     * @param  ConnectionInterface $con
+     * @return boolean
+     */
+    public function preDelete(ConnectionInterface $con = null)
+    {
+        return true;
+    }
+
+    /**
+     * Code to be run after deleting the object in database
+     * @param ConnectionInterface $con
+     */
+    public function postDelete(ConnectionInterface $con = null)
+    {
+
+    }
+
+
+    /**
+     * Derived method to catches calls to undefined methods.
+     *
+     * Provides magic import/export method support (fromXML()/toXML(), fromYAML()/toYAML(), etc.).
+     * Allows to define default __call() behavior if you overwrite __call()
+     *
+     * @param string $name
+     * @param mixed  $params
+     *
+     * @return array|string
+     */
+    public function __call($name, $params)
+    {
+        if (0 === strpos($name, 'get')) {
+            $virtualColumn = substr($name, 3);
+            if ($this->hasVirtualColumn($virtualColumn)) {
+                return $this->getVirtualColumn($virtualColumn);
+            }
+
+            $virtualColumn = lcfirst($virtualColumn);
+            if ($this->hasVirtualColumn($virtualColumn)) {
+                return $this->getVirtualColumn($virtualColumn);
+            }
+        }
+
+        if (0 === strpos($name, 'from')) {
+            $format = substr($name, 4);
+
+            return $this->importFrom($format, reset($params));
+        }
+
+        if (0 === strpos($name, 'to')) {
+            $format = substr($name, 2);
+            $includeLazyLoadColumns = isset($params[0]) ? $params[0] : true;
+
+            return $this->exportTo($format, $includeLazyLoadColumns);
+        }
+
+        throw new BadMethodCallException(sprintf('Call to undefined method: %s.', $name));
+    }
+
+}
diff --git a/core/lib/Thelia/Model/Base/OrderProductTaxQuery.php b/core/lib/Thelia/Model/Base/OrderProductTaxQuery.php
new file mode 100644
index 000000000..d37c2c501
--- /dev/null
+++ b/core/lib/Thelia/Model/Base/OrderProductTaxQuery.php
@@ -0,0 +1,744 @@
+<?php
+
+namespace Thelia\Model\Base;
+
+use \Exception;
+use \PDO;
+use Propel\Runtime\Propel;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
+use Propel\Runtime\ActiveQuery\ModelJoin;
+use Propel\Runtime\Collection\Collection;
+use Propel\Runtime\Collection\ObjectCollection;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Exception\PropelException;
+use Thelia\Model\OrderProductTax as ChildOrderProductTax;
+use Thelia\Model\OrderProductTaxQuery as ChildOrderProductTaxQuery;
+use Thelia\Model\Map\OrderProductTaxTableMap;
+
+/**
+ * Base class that represents a query for the 'order_product_tax' table.
+ *
+ *
+ *
+ * @method     ChildOrderProductTaxQuery orderById($order = Criteria::ASC) Order by the id column
+ * @method     ChildOrderProductTaxQuery orderByOrderProductId($order = Criteria::ASC) Order by the order_product_id column
+ * @method     ChildOrderProductTaxQuery orderByTitle($order = Criteria::ASC) Order by the title column
+ * @method     ChildOrderProductTaxQuery orderByDescription($order = Criteria::ASC) Order by the description column
+ * @method     ChildOrderProductTaxQuery orderByAmount($order = Criteria::ASC) Order by the amount column
+ * @method     ChildOrderProductTaxQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
+ * @method     ChildOrderProductTaxQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
+ *
+ * @method     ChildOrderProductTaxQuery groupById() Group by the id column
+ * @method     ChildOrderProductTaxQuery groupByOrderProductId() Group by the order_product_id column
+ * @method     ChildOrderProductTaxQuery groupByTitle() Group by the title column
+ * @method     ChildOrderProductTaxQuery groupByDescription() Group by the description column
+ * @method     ChildOrderProductTaxQuery groupByAmount() Group by the amount column
+ * @method     ChildOrderProductTaxQuery groupByCreatedAt() Group by the created_at column
+ * @method     ChildOrderProductTaxQuery groupByUpdatedAt() Group by the updated_at column
+ *
+ * @method     ChildOrderProductTaxQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
+ * @method     ChildOrderProductTaxQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
+ * @method     ChildOrderProductTaxQuery innerJoin($relation) Adds a INNER JOIN clause to the query
+ *
+ * @method     ChildOrderProductTaxQuery leftJoinOrderProduct($relationAlias = null) Adds a LEFT JOIN clause to the query using the OrderProduct relation
+ * @method     ChildOrderProductTaxQuery rightJoinOrderProduct($relationAlias = null) Adds a RIGHT JOIN clause to the query using the OrderProduct relation
+ * @method     ChildOrderProductTaxQuery innerJoinOrderProduct($relationAlias = null) Adds a INNER JOIN clause to the query using the OrderProduct relation
+ *
+ * @method     ChildOrderProductTax findOne(ConnectionInterface $con = null) Return the first ChildOrderProductTax matching the query
+ * @method     ChildOrderProductTax findOneOrCreate(ConnectionInterface $con = null) Return the first ChildOrderProductTax matching the query, or a new ChildOrderProductTax object populated from the query conditions when no match is found
+ *
+ * @method     ChildOrderProductTax findOneById(int $id) Return the first ChildOrderProductTax filtered by the id column
+ * @method     ChildOrderProductTax findOneByOrderProductId(int $order_product_id) Return the first ChildOrderProductTax filtered by the order_product_id column
+ * @method     ChildOrderProductTax findOneByTitle(string $title) Return the first ChildOrderProductTax filtered by the title column
+ * @method     ChildOrderProductTax findOneByDescription(string $description) Return the first ChildOrderProductTax filtered by the description column
+ * @method     ChildOrderProductTax findOneByAmount(double $amount) Return the first ChildOrderProductTax filtered by the amount column
+ * @method     ChildOrderProductTax findOneByCreatedAt(string $created_at) Return the first ChildOrderProductTax filtered by the created_at column
+ * @method     ChildOrderProductTax findOneByUpdatedAt(string $updated_at) Return the first ChildOrderProductTax filtered by the updated_at column
+ *
+ * @method     array findById(int $id) Return ChildOrderProductTax objects filtered by the id column
+ * @method     array findByOrderProductId(int $order_product_id) Return ChildOrderProductTax objects filtered by the order_product_id column
+ * @method     array findByTitle(string $title) Return ChildOrderProductTax objects filtered by the title column
+ * @method     array findByDescription(string $description) Return ChildOrderProductTax objects filtered by the description column
+ * @method     array findByAmount(double $amount) Return ChildOrderProductTax objects filtered by the amount column
+ * @method     array findByCreatedAt(string $created_at) Return ChildOrderProductTax objects filtered by the created_at column
+ * @method     array findByUpdatedAt(string $updated_at) Return ChildOrderProductTax objects filtered by the updated_at column
+ *
+ */
+abstract class OrderProductTaxQuery extends ModelCriteria
+{
+
+    /**
+     * Initializes internal state of \Thelia\Model\Base\OrderProductTaxQuery object.
+     *
+     * @param     string $dbName The database name
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
+     */
+    public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\OrderProductTax', $modelAlias = null)
+    {
+        parent::__construct($dbName, $modelName, $modelAlias);
+    }
+
+    /**
+     * Returns a new ChildOrderProductTaxQuery object.
+     *
+     * @param     string $modelAlias The alias of a model in the query
+     * @param     Criteria $criteria Optional Criteria to build the query from
+     *
+     * @return ChildOrderProductTaxQuery
+     */
+    public static function create($modelAlias = null, $criteria = null)
+    {
+        if ($criteria instanceof \Thelia\Model\OrderProductTaxQuery) {
+            return $criteria;
+        }
+        $query = new \Thelia\Model\OrderProductTaxQuery();
+        if (null !== $modelAlias) {
+            $query->setModelAlias($modelAlias);
+        }
+        if ($criteria instanceof Criteria) {
+            $query->mergeWith($criteria);
+        }
+
+        return $query;
+    }
+
+    /**
+     * Find object by primary key.
+     * Propel uses the instance pool to skip the database if the object exists.
+     * Go fast if the query is untouched.
+     *
+     * <code>
+     * $obj  = $c->findPk(12, $con);
+     * </code>
+     *
+     * @param mixed $key Primary key to use for the query
+     * @param ConnectionInterface $con an optional connection object
+     *
+     * @return ChildOrderProductTax|array|mixed the result, formatted by the current formatter
+     */
+    public function findPk($key, $con = null)
+    {
+        if ($key === null) {
+            return null;
+        }
+        if ((null !== ($obj = OrderProductTaxTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
+            // the object is already in the instance pool
+            return $obj;
+        }
+        if ($con === null) {
+            $con = Propel::getServiceContainer()->getReadConnection(OrderProductTaxTableMap::DATABASE_NAME);
+        }
+        $this->basePreSelect($con);
+        if ($this->formatter || $this->modelAlias || $this->with || $this->select
+         || $this->selectColumns || $this->asColumns || $this->selectModifiers
+         || $this->map || $this->having || $this->joins) {
+            return $this->findPkComplex($key, $con);
+        } else {
+            return $this->findPkSimple($key, $con);
+        }
+    }
+
+    /**
+     * Find object by primary key using raw SQL to go fast.
+     * Bypass doSelect() and the object formatter by using generated code.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     ConnectionInterface $con A connection object
+     *
+     * @return   ChildOrderProductTax A model object, or null if the key is not found
+     */
+    protected function findPkSimple($key, $con)
+    {
+        $sql = 'SELECT ID, ORDER_PRODUCT_ID, TITLE, DESCRIPTION, AMOUNT, CREATED_AT, UPDATED_AT FROM order_product_tax WHERE ID = :p0';
+        try {
+            $stmt = $con->prepare($sql);
+            $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
+        }
+        $obj = null;
+        if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
+            $obj = new ChildOrderProductTax();
+            $obj->hydrate($row);
+            OrderProductTaxTableMap::addInstanceToPool($obj, (string) $key);
+        }
+        $stmt->closeCursor();
+
+        return $obj;
+    }
+
+    /**
+     * Find object by primary key.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     ConnectionInterface $con A connection object
+     *
+     * @return ChildOrderProductTax|array|mixed the result, formatted by the current formatter
+     */
+    protected function findPkComplex($key, $con)
+    {
+        // As the query uses a PK condition, no limit(1) is necessary.
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $dataFetcher = $criteria
+            ->filterByPrimaryKey($key)
+            ->doSelect($con);
+
+        return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher);
+    }
+
+    /**
+     * Find objects by primary key
+     * <code>
+     * $objs = $c->findPks(array(12, 56, 832), $con);
+     * </code>
+     * @param     array $keys Primary keys to use for the query
+     * @param     ConnectionInterface $con an optional connection object
+     *
+     * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
+     */
+    public function findPks($keys, $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getReadConnection($this->getDbName());
+        }
+        $this->basePreSelect($con);
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $dataFetcher = $criteria
+            ->filterByPrimaryKeys($keys)
+            ->doSelect($con);
+
+        return $criteria->getFormatter()->init($criteria)->format($dataFetcher);
+    }
+
+    /**
+     * Filter the query by primary key
+     *
+     * @param     mixed $key Primary key to use for the query
+     *
+     * @return ChildOrderProductTaxQuery The current query, for fluid interface
+     */
+    public function filterByPrimaryKey($key)
+    {
+
+        return $this->addUsingAlias(OrderProductTaxTableMap::ID, $key, Criteria::EQUAL);
+    }
+
+    /**
+     * Filter the query by a list of primary keys
+     *
+     * @param     array $keys The list of primary key to use for the query
+     *
+     * @return ChildOrderProductTaxQuery The current query, for fluid interface
+     */
+    public function filterByPrimaryKeys($keys)
+    {
+
+        return $this->addUsingAlias(OrderProductTaxTableMap::ID, $keys, Criteria::IN);
+    }
+
+    /**
+     * Filter the query on the id column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterById(1234); // WHERE id = 1234
+     * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
+     * $query->filterById(array('min' => 12)); // WHERE id > 12
+     * </code>
+     *
+     * @param     mixed $id The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductTaxQuery The current query, for fluid interface
+     */
+    public function filterById($id = null, $comparison = null)
+    {
+        if (is_array($id)) {
+            $useMinMax = false;
+            if (isset($id['min'])) {
+                $this->addUsingAlias(OrderProductTaxTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($id['max'])) {
+                $this->addUsingAlias(OrderProductTaxTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTaxTableMap::ID, $id, $comparison);
+    }
+
+    /**
+     * Filter the query on the order_product_id column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByOrderProductId(1234); // WHERE order_product_id = 1234
+     * $query->filterByOrderProductId(array(12, 34)); // WHERE order_product_id IN (12, 34)
+     * $query->filterByOrderProductId(array('min' => 12)); // WHERE order_product_id > 12
+     * </code>
+     *
+     * @see       filterByOrderProduct()
+     *
+     * @param     mixed $orderProductId The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductTaxQuery The current query, for fluid interface
+     */
+    public function filterByOrderProductId($orderProductId = null, $comparison = null)
+    {
+        if (is_array($orderProductId)) {
+            $useMinMax = false;
+            if (isset($orderProductId['min'])) {
+                $this->addUsingAlias(OrderProductTaxTableMap::ORDER_PRODUCT_ID, $orderProductId['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($orderProductId['max'])) {
+                $this->addUsingAlias(OrderProductTaxTableMap::ORDER_PRODUCT_ID, $orderProductId['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTaxTableMap::ORDER_PRODUCT_ID, $orderProductId, $comparison);
+    }
+
+    /**
+     * Filter the query on the title column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByTitle('fooValue');   // WHERE title = 'fooValue'
+     * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $title The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductTaxQuery The current query, for fluid interface
+     */
+    public function filterByTitle($title = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($title)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $title)) {
+                $title = str_replace('*', '%', $title);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTaxTableMap::TITLE, $title, $comparison);
+    }
+
+    /**
+     * Filter the query on the description column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByDescription('fooValue');   // WHERE description = 'fooValue'
+     * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $description The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductTaxQuery The current query, for fluid interface
+     */
+    public function filterByDescription($description = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($description)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $description)) {
+                $description = str_replace('*', '%', $description);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTaxTableMap::DESCRIPTION, $description, $comparison);
+    }
+
+    /**
+     * Filter the query on the amount column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByAmount(1234); // WHERE amount = 1234
+     * $query->filterByAmount(array(12, 34)); // WHERE amount IN (12, 34)
+     * $query->filterByAmount(array('min' => 12)); // WHERE amount > 12
+     * </code>
+     *
+     * @param     mixed $amount The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductTaxQuery The current query, for fluid interface
+     */
+    public function filterByAmount($amount = null, $comparison = null)
+    {
+        if (is_array($amount)) {
+            $useMinMax = false;
+            if (isset($amount['min'])) {
+                $this->addUsingAlias(OrderProductTaxTableMap::AMOUNT, $amount['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($amount['max'])) {
+                $this->addUsingAlias(OrderProductTaxTableMap::AMOUNT, $amount['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTaxTableMap::AMOUNT, $amount, $comparison);
+    }
+
+    /**
+     * Filter the query on the created_at column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14'
+     * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14'
+     * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
+     * </code>
+     *
+     * @param     mixed $createdAt The value to use as filter.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Empty strings are treated as NULL.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductTaxQuery The current query, for fluid interface
+     */
+    public function filterByCreatedAt($createdAt = null, $comparison = null)
+    {
+        if (is_array($createdAt)) {
+            $useMinMax = false;
+            if (isset($createdAt['min'])) {
+                $this->addUsingAlias(OrderProductTaxTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($createdAt['max'])) {
+                $this->addUsingAlias(OrderProductTaxTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTaxTableMap::CREATED_AT, $createdAt, $comparison);
+    }
+
+    /**
+     * Filter the query on the updated_at column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14'
+     * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14'
+     * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
+     * </code>
+     *
+     * @param     mixed $updatedAt The value to use as filter.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Empty strings are treated as NULL.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductTaxQuery The current query, for fluid interface
+     */
+    public function filterByUpdatedAt($updatedAt = null, $comparison = null)
+    {
+        if (is_array($updatedAt)) {
+            $useMinMax = false;
+            if (isset($updatedAt['min'])) {
+                $this->addUsingAlias(OrderProductTaxTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($updatedAt['max'])) {
+                $this->addUsingAlias(OrderProductTaxTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTaxTableMap::UPDATED_AT, $updatedAt, $comparison);
+    }
+
+    /**
+     * Filter the query by a related \Thelia\Model\OrderProduct object
+     *
+     * @param \Thelia\Model\OrderProduct|ObjectCollection $orderProduct The related object(s) to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductTaxQuery The current query, for fluid interface
+     */
+    public function filterByOrderProduct($orderProduct, $comparison = null)
+    {
+        if ($orderProduct instanceof \Thelia\Model\OrderProduct) {
+            return $this
+                ->addUsingAlias(OrderProductTaxTableMap::ORDER_PRODUCT_ID, $orderProduct->getId(), $comparison);
+        } elseif ($orderProduct instanceof ObjectCollection) {
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+
+            return $this
+                ->addUsingAlias(OrderProductTaxTableMap::ORDER_PRODUCT_ID, $orderProduct->toKeyValue('PrimaryKey', 'Id'), $comparison);
+        } else {
+            throw new PropelException('filterByOrderProduct() only accepts arguments of type \Thelia\Model\OrderProduct or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the OrderProduct relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return ChildOrderProductTaxQuery The current query, for fluid interface
+     */
+    public function joinOrderProduct($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('OrderProduct');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'OrderProduct');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the OrderProduct relation OrderProduct object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return   \Thelia\Model\OrderProductQuery A secondary query class using the current class as primary query
+     */
+    public function useOrderProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    {
+        return $this
+            ->joinOrderProduct($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'OrderProduct', '\Thelia\Model\OrderProductQuery');
+    }
+
+    /**
+     * Exclude object from result
+     *
+     * @param   ChildOrderProductTax $orderProductTax Object to remove from the list of results
+     *
+     * @return ChildOrderProductTaxQuery The current query, for fluid interface
+     */
+    public function prune($orderProductTax = null)
+    {
+        if ($orderProductTax) {
+            $this->addUsingAlias(OrderProductTaxTableMap::ID, $orderProductTax->getId(), Criteria::NOT_EQUAL);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Deletes all rows from the order_product_tax table.
+     *
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).
+     */
+    public function doDeleteAll(ConnectionInterface $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductTaxTableMap::DATABASE_NAME);
+        }
+        $affectedRows = 0; // initialize var to track total num of affected rows
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table or we could emulating ON DELETE CASCADE, etc.
+            $con->beginTransaction();
+            $affectedRows += parent::doDeleteAll($con);
+            // Because this db requires some delete cascade/set null emulation, we have to
+            // clear the cached instance *after* the emulation has happened (since
+            // instances get re-added by the select statement contained therein).
+            OrderProductTaxTableMap::clearInstancePool();
+            OrderProductTaxTableMap::clearRelatedInstancePool();
+
+            $con->commit();
+        } catch (PropelException $e) {
+            $con->rollBack();
+            throw $e;
+        }
+
+        return $affectedRows;
+    }
+
+    /**
+     * Performs a DELETE on the database, given a ChildOrderProductTax or Criteria object OR a primary key value.
+     *
+     * @param mixed               $values Criteria or ChildOrderProductTax object or primary key or array of primary keys
+     *              which is used to create the DELETE statement
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     *                if supported by native driver or if emulated using Propel.
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+     public function delete(ConnectionInterface $con = null)
+     {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductTaxTableMap::DATABASE_NAME);
+        }
+
+        $criteria = $this;
+
+        // Set the correct dbName
+        $criteria->setDbName(OrderProductTaxTableMap::DATABASE_NAME);
+
+        $affectedRows = 0; // initialize var to track total num of affected rows
+
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table or we could emulating ON DELETE CASCADE, etc.
+            $con->beginTransaction();
+
+
+        OrderProductTaxTableMap::removeInstanceFromPool($criteria);
+
+            $affectedRows += ModelCriteria::delete($con);
+            OrderProductTaxTableMap::clearRelatedInstancePool();
+            $con->commit();
+
+            return $affectedRows;
+        } catch (PropelException $e) {
+            $con->rollBack();
+            throw $e;
+        }
+    }
+
+    // timestampable behavior
+
+    /**
+     * Filter by the latest updated
+     *
+     * @param      int $nbDays Maximum age of the latest update in days
+     *
+     * @return     ChildOrderProductTaxQuery The current query, for fluid interface
+     */
+    public function recentlyUpdated($nbDays = 7)
+    {
+        return $this->addUsingAlias(OrderProductTaxTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+    }
+
+    /**
+     * Filter by the latest created
+     *
+     * @param      int $nbDays Maximum age of in days
+     *
+     * @return     ChildOrderProductTaxQuery The current query, for fluid interface
+     */
+    public function recentlyCreated($nbDays = 7)
+    {
+        return $this->addUsingAlias(OrderProductTaxTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+    }
+
+    /**
+     * Order by update date desc
+     *
+     * @return     ChildOrderProductTaxQuery The current query, for fluid interface
+     */
+    public function lastUpdatedFirst()
+    {
+        return $this->addDescendingOrderByColumn(OrderProductTaxTableMap::UPDATED_AT);
+    }
+
+    /**
+     * Order by update date asc
+     *
+     * @return     ChildOrderProductTaxQuery The current query, for fluid interface
+     */
+    public function firstUpdatedFirst()
+    {
+        return $this->addAscendingOrderByColumn(OrderProductTaxTableMap::UPDATED_AT);
+    }
+
+    /**
+     * Order by create date desc
+     *
+     * @return     ChildOrderProductTaxQuery The current query, for fluid interface
+     */
+    public function lastCreatedFirst()
+    {
+        return $this->addDescendingOrderByColumn(OrderProductTaxTableMap::CREATED_AT);
+    }
+
+    /**
+     * Order by create date asc
+     *
+     * @return     ChildOrderProductTaxQuery The current query, for fluid interface
+     */
+    public function firstCreatedFirst()
+    {
+        return $this->addAscendingOrderByColumn(OrderProductTaxTableMap::CREATED_AT);
+    }
+
+} // OrderProductTaxQuery
diff --git a/core/lib/Thelia/Model/Map/OrderProductAttributeCombinationTableMap.php b/core/lib/Thelia/Model/Map/OrderProductAttributeCombinationTableMap.php
new file mode 100644
index 000000000..582bd2305
--- /dev/null
+++ b/core/lib/Thelia/Model/Map/OrderProductAttributeCombinationTableMap.php
@@ -0,0 +1,503 @@
+<?php
+
+namespace Thelia\Model\Map;
+
+use Propel\Runtime\Propel;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\InstancePoolTrait;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Exception\PropelException;
+use Propel\Runtime\Map\RelationMap;
+use Propel\Runtime\Map\TableMap;
+use Propel\Runtime\Map\TableMapTrait;
+use Thelia\Model\OrderProductAttributeCombination;
+use Thelia\Model\OrderProductAttributeCombinationQuery;
+
+
+/**
+ * This class defines the structure of the 'order_product_attribute_combination' table.
+ *
+ *
+ *
+ * This map class is used by Propel to do runtime db structure discovery.
+ * For example, the createSelectSql() method checks the type of a given column used in an
+ * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
+ * (i.e. if it's a text column type).
+ *
+ */
+class OrderProductAttributeCombinationTableMap extends TableMap
+{
+    use InstancePoolTrait;
+    use TableMapTrait;
+    /**
+     * The (dot-path) name of this class
+     */
+    const CLASS_NAME = 'Thelia.Model.Map.OrderProductAttributeCombinationTableMap';
+
+    /**
+     * The default database name for this class
+     */
+    const DATABASE_NAME = 'thelia';
+
+    /**
+     * The table name for this class
+     */
+    const TABLE_NAME = 'order_product_attribute_combination';
+
+    /**
+     * The related Propel class for this table
+     */
+    const OM_CLASS = '\\Thelia\\Model\\OrderProductAttributeCombination';
+
+    /**
+     * A class that can be returned by this tableMap
+     */
+    const CLASS_DEFAULT = 'Thelia.Model.OrderProductAttributeCombination';
+
+    /**
+     * The total number of columns
+     */
+    const NUM_COLUMNS = 12;
+
+    /**
+     * The number of lazy-loaded columns
+     */
+    const NUM_LAZY_LOAD_COLUMNS = 0;
+
+    /**
+     * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
+     */
+    const NUM_HYDRATE_COLUMNS = 12;
+
+    /**
+     * the column name for the ID field
+     */
+    const ID = 'order_product_attribute_combination.ID';
+
+    /**
+     * the column name for the ORDER_PRODUCT_ID field
+     */
+    const ORDER_PRODUCT_ID = 'order_product_attribute_combination.ORDER_PRODUCT_ID';
+
+    /**
+     * the column name for the ATTRIBUTE_TITLE field
+     */
+    const ATTRIBUTE_TITLE = 'order_product_attribute_combination.ATTRIBUTE_TITLE';
+
+    /**
+     * the column name for the ATTRIBUTE_CHAPO field
+     */
+    const ATTRIBUTE_CHAPO = 'order_product_attribute_combination.ATTRIBUTE_CHAPO';
+
+    /**
+     * the column name for the ATTRIBUTE_DESCRIPTION field
+     */
+    const ATTRIBUTE_DESCRIPTION = 'order_product_attribute_combination.ATTRIBUTE_DESCRIPTION';
+
+    /**
+     * the column name for the ATTRIBUTE_POSTSCRIPTUMN field
+     */
+    const ATTRIBUTE_POSTSCRIPTUMN = 'order_product_attribute_combination.ATTRIBUTE_POSTSCRIPTUMN';
+
+    /**
+     * the column name for the ATTRIBUTE_AV_TITLE field
+     */
+    const ATTRIBUTE_AV_TITLE = 'order_product_attribute_combination.ATTRIBUTE_AV_TITLE';
+
+    /**
+     * the column name for the ATTRIBUTE_AV_CHAPO field
+     */
+    const ATTRIBUTE_AV_CHAPO = 'order_product_attribute_combination.ATTRIBUTE_AV_CHAPO';
+
+    /**
+     * the column name for the ATTRIBUTE_AV_DESCRIPTION field
+     */
+    const ATTRIBUTE_AV_DESCRIPTION = 'order_product_attribute_combination.ATTRIBUTE_AV_DESCRIPTION';
+
+    /**
+     * the column name for the ATTRIBUTE_AV_POSTSCRIPTUM field
+     */
+    const ATTRIBUTE_AV_POSTSCRIPTUM = 'order_product_attribute_combination.ATTRIBUTE_AV_POSTSCRIPTUM';
+
+    /**
+     * the column name for the CREATED_AT field
+     */
+    const CREATED_AT = 'order_product_attribute_combination.CREATED_AT';
+
+    /**
+     * the column name for the UPDATED_AT field
+     */
+    const UPDATED_AT = 'order_product_attribute_combination.UPDATED_AT';
+
+    /**
+     * The default string format for model objects of the related table
+     */
+    const DEFAULT_STRING_FORMAT = 'YAML';
+
+    /**
+     * holds an array of fieldnames
+     *
+     * first dimension keys are the type constants
+     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
+     */
+    protected static $fieldNames = array (
+        self::TYPE_PHPNAME       => array('Id', 'OrderProductId', 'AttributeTitle', 'AttributeChapo', 'AttributeDescription', 'AttributePostscriptumn', 'AttributeAvTitle', 'AttributeAvChapo', 'AttributeAvDescription', 'AttributeAvPostscriptum', 'CreatedAt', 'UpdatedAt', ),
+        self::TYPE_STUDLYPHPNAME => array('id', 'orderProductId', 'attributeTitle', 'attributeChapo', 'attributeDescription', 'attributePostscriptumn', 'attributeAvTitle', 'attributeAvChapo', 'attributeAvDescription', 'attributeAvPostscriptum', 'createdAt', 'updatedAt', ),
+        self::TYPE_COLNAME       => array(OrderProductAttributeCombinationTableMap::ID, OrderProductAttributeCombinationTableMap::ORDER_PRODUCT_ID, OrderProductAttributeCombinationTableMap::ATTRIBUTE_TITLE, OrderProductAttributeCombinationTableMap::ATTRIBUTE_CHAPO, OrderProductAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION, OrderProductAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN, OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE, OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO, OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION, OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM, OrderProductAttributeCombinationTableMap::CREATED_AT, OrderProductAttributeCombinationTableMap::UPDATED_AT, ),
+        self::TYPE_RAW_COLNAME   => array('ID', 'ORDER_PRODUCT_ID', 'ATTRIBUTE_TITLE', 'ATTRIBUTE_CHAPO', 'ATTRIBUTE_DESCRIPTION', 'ATTRIBUTE_POSTSCRIPTUMN', 'ATTRIBUTE_AV_TITLE', 'ATTRIBUTE_AV_CHAPO', 'ATTRIBUTE_AV_DESCRIPTION', 'ATTRIBUTE_AV_POSTSCRIPTUM', 'CREATED_AT', 'UPDATED_AT', ),
+        self::TYPE_FIELDNAME     => array('id', 'order_product_id', 'attribute_title', 'attribute_chapo', 'attribute_description', 'attribute_postscriptumn', 'attribute_av_title', 'attribute_av_chapo', 'attribute_av_description', 'attribute_av_postscriptum', 'created_at', 'updated_at', ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, )
+    );
+
+    /**
+     * holds an array of keys for quick access to the fieldnames array
+     *
+     * first dimension keys are the type constants
+     * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
+     */
+    protected static $fieldKeys = array (
+        self::TYPE_PHPNAME       => array('Id' => 0, 'OrderProductId' => 1, 'AttributeTitle' => 2, 'AttributeChapo' => 3, 'AttributeDescription' => 4, 'AttributePostscriptumn' => 5, 'AttributeAvTitle' => 6, 'AttributeAvChapo' => 7, 'AttributeAvDescription' => 8, 'AttributeAvPostscriptum' => 9, 'CreatedAt' => 10, 'UpdatedAt' => 11, ),
+        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'orderProductId' => 1, 'attributeTitle' => 2, 'attributeChapo' => 3, 'attributeDescription' => 4, 'attributePostscriptumn' => 5, 'attributeAvTitle' => 6, 'attributeAvChapo' => 7, 'attributeAvDescription' => 8, 'attributeAvPostscriptum' => 9, 'createdAt' => 10, 'updatedAt' => 11, ),
+        self::TYPE_COLNAME       => array(OrderProductAttributeCombinationTableMap::ID => 0, OrderProductAttributeCombinationTableMap::ORDER_PRODUCT_ID => 1, OrderProductAttributeCombinationTableMap::ATTRIBUTE_TITLE => 2, OrderProductAttributeCombinationTableMap::ATTRIBUTE_CHAPO => 3, OrderProductAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION => 4, OrderProductAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN => 5, OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE => 6, OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO => 7, OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION => 8, OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM => 9, OrderProductAttributeCombinationTableMap::CREATED_AT => 10, OrderProductAttributeCombinationTableMap::UPDATED_AT => 11, ),
+        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'ORDER_PRODUCT_ID' => 1, 'ATTRIBUTE_TITLE' => 2, 'ATTRIBUTE_CHAPO' => 3, 'ATTRIBUTE_DESCRIPTION' => 4, 'ATTRIBUTE_POSTSCRIPTUMN' => 5, 'ATTRIBUTE_AV_TITLE' => 6, 'ATTRIBUTE_AV_CHAPO' => 7, 'ATTRIBUTE_AV_DESCRIPTION' => 8, 'ATTRIBUTE_AV_POSTSCRIPTUM' => 9, 'CREATED_AT' => 10, 'UPDATED_AT' => 11, ),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'order_product_id' => 1, 'attribute_title' => 2, 'attribute_chapo' => 3, 'attribute_description' => 4, 'attribute_postscriptumn' => 5, 'attribute_av_title' => 6, 'attribute_av_chapo' => 7, 'attribute_av_description' => 8, 'attribute_av_postscriptum' => 9, 'created_at' => 10, 'updated_at' => 11, ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, )
+    );
+
+    /**
+     * Initialize the table attributes and columns
+     * Relations are not initialized by this method since they are lazy loaded
+     *
+     * @return void
+     * @throws PropelException
+     */
+    public function initialize()
+    {
+        // attributes
+        $this->setName('order_product_attribute_combination');
+        $this->setPhpName('OrderProductAttributeCombination');
+        $this->setClassName('\\Thelia\\Model\\OrderProductAttributeCombination');
+        $this->setPackage('Thelia.Model');
+        $this->setUseIdGenerator(true);
+        // columns
+        $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
+        $this->addForeignKey('ORDER_PRODUCT_ID', 'OrderProductId', 'INTEGER', 'order_product', 'ID', true, null, null);
+        $this->addColumn('ATTRIBUTE_TITLE', 'AttributeTitle', 'VARCHAR', true, 255, null);
+        $this->addColumn('ATTRIBUTE_CHAPO', 'AttributeChapo', 'LONGVARCHAR', false, null, null);
+        $this->addColumn('ATTRIBUTE_DESCRIPTION', 'AttributeDescription', 'CLOB', false, null, null);
+        $this->addColumn('ATTRIBUTE_POSTSCRIPTUMN', 'AttributePostscriptumn', 'LONGVARCHAR', false, null, null);
+        $this->addColumn('ATTRIBUTE_AV_TITLE', 'AttributeAvTitle', 'VARCHAR', true, 255, null);
+        $this->addColumn('ATTRIBUTE_AV_CHAPO', 'AttributeAvChapo', 'LONGVARCHAR', false, null, null);
+        $this->addColumn('ATTRIBUTE_AV_DESCRIPTION', 'AttributeAvDescription', 'CLOB', false, null, null);
+        $this->addColumn('ATTRIBUTE_AV_POSTSCRIPTUM', 'AttributeAvPostscriptum', 'LONGVARCHAR', false, null, null);
+        $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
+        $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
+    } // initialize()
+
+    /**
+     * Build the RelationMap objects for this table relationships
+     */
+    public function buildRelations()
+    {
+        $this->addRelation('OrderProduct', '\\Thelia\\Model\\OrderProduct', RelationMap::MANY_TO_ONE, array('order_product_id' => 'id', ), 'CASCADE', 'RESTRICT');
+    } // buildRelations()
+
+    /**
+     *
+     * Gets the list of behaviors registered for this table
+     *
+     * @return array Associative array (name => parameters) of behaviors
+     */
+    public function getBehaviors()
+    {
+        return array(
+            'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
+        );
+    } // getBehaviors()
+
+    /**
+     * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
+     *
+     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+     * a multi-column primary key, a serialize()d version of the primary key will be returned.
+     *
+     * @param array  $row       resultset row.
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+     */
+    public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+        // If the PK cannot be derived from the row, return NULL.
+        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+            return null;
+        }
+
+        return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+    }
+
+    /**
+     * Retrieves the primary key from the DB resultset row
+     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+     * a multi-column primary key, an array of the primary key columns will be returned.
+     *
+     * @param array  $row       resultset row.
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+     *
+     * @return mixed The primary key of the row
+     */
+    public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+
+            return (int) $row[
+                            $indexType == TableMap::TYPE_NUM
+                            ? 0 + $offset
+                            : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
+                        ];
+    }
+
+    /**
+     * The class that the tableMap will make instances of.
+     *
+     * If $withPrefix is true, the returned path
+     * uses a dot-path notation which is translated into a path
+     * relative to a location on the PHP include_path.
+     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
+     *
+     * @param boolean $withPrefix Whether or not to return the path with the class name
+     * @return string path.to.ClassName
+     */
+    public static function getOMClass($withPrefix = true)
+    {
+        return $withPrefix ? OrderProductAttributeCombinationTableMap::CLASS_DEFAULT : OrderProductAttributeCombinationTableMap::OM_CLASS;
+    }
+
+    /**
+     * Populates an object of the default type or an object that inherit from the default.
+     *
+     * @param array  $row       row returned by DataFetcher->fetch().
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+                                 One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     * @return array (OrderProductAttributeCombination object, last column rank)
+     */
+    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+        $key = OrderProductAttributeCombinationTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
+        if (null !== ($obj = OrderProductAttributeCombinationTableMap::getInstanceFromPool($key))) {
+            // We no longer rehydrate the object, since this can cause data loss.
+            // See http://www.propelorm.org/ticket/509
+            // $obj->hydrate($row, $offset, true); // rehydrate
+            $col = $offset + OrderProductAttributeCombinationTableMap::NUM_HYDRATE_COLUMNS;
+        } else {
+            $cls = OrderProductAttributeCombinationTableMap::OM_CLASS;
+            $obj = new $cls();
+            $col = $obj->hydrate($row, $offset, false, $indexType);
+            OrderProductAttributeCombinationTableMap::addInstanceToPool($obj, $key);
+        }
+
+        return array($obj, $col);
+    }
+
+    /**
+     * The returned array will contain objects of the default type or
+     * objects that inherit from the default.
+     *
+     * @param DataFetcherInterface $dataFetcher
+     * @return array
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function populateObjects(DataFetcherInterface $dataFetcher)
+    {
+        $results = array();
+
+        // set the class once to avoid overhead in the loop
+        $cls = static::getOMClass(false);
+        // populate the object(s)
+        while ($row = $dataFetcher->fetch()) {
+            $key = OrderProductAttributeCombinationTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
+            if (null !== ($obj = OrderProductAttributeCombinationTableMap::getInstanceFromPool($key))) {
+                // We no longer rehydrate the object, since this can cause data loss.
+                // See http://www.propelorm.org/ticket/509
+                // $obj->hydrate($row, 0, true); // rehydrate
+                $results[] = $obj;
+            } else {
+                $obj = new $cls();
+                $obj->hydrate($row);
+                $results[] = $obj;
+                OrderProductAttributeCombinationTableMap::addInstanceToPool($obj, $key);
+            } // if key exists
+        }
+
+        return $results;
+    }
+    /**
+     * Add all the columns needed to create a new object.
+     *
+     * Note: any columns that were marked with lazyLoad="true" in the
+     * XML schema will not be added to the select list and only loaded
+     * on demand.
+     *
+     * @param Criteria $criteria object containing the columns to add.
+     * @param string   $alias    optional table alias
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function addSelectColumns(Criteria $criteria, $alias = null)
+    {
+        if (null === $alias) {
+            $criteria->addSelectColumn(OrderProductAttributeCombinationTableMap::ID);
+            $criteria->addSelectColumn(OrderProductAttributeCombinationTableMap::ORDER_PRODUCT_ID);
+            $criteria->addSelectColumn(OrderProductAttributeCombinationTableMap::ATTRIBUTE_TITLE);
+            $criteria->addSelectColumn(OrderProductAttributeCombinationTableMap::ATTRIBUTE_CHAPO);
+            $criteria->addSelectColumn(OrderProductAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION);
+            $criteria->addSelectColumn(OrderProductAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN);
+            $criteria->addSelectColumn(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE);
+            $criteria->addSelectColumn(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO);
+            $criteria->addSelectColumn(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION);
+            $criteria->addSelectColumn(OrderProductAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM);
+            $criteria->addSelectColumn(OrderProductAttributeCombinationTableMap::CREATED_AT);
+            $criteria->addSelectColumn(OrderProductAttributeCombinationTableMap::UPDATED_AT);
+        } else {
+            $criteria->addSelectColumn($alias . '.ID');
+            $criteria->addSelectColumn($alias . '.ORDER_PRODUCT_ID');
+            $criteria->addSelectColumn($alias . '.ATTRIBUTE_TITLE');
+            $criteria->addSelectColumn($alias . '.ATTRIBUTE_CHAPO');
+            $criteria->addSelectColumn($alias . '.ATTRIBUTE_DESCRIPTION');
+            $criteria->addSelectColumn($alias . '.ATTRIBUTE_POSTSCRIPTUMN');
+            $criteria->addSelectColumn($alias . '.ATTRIBUTE_AV_TITLE');
+            $criteria->addSelectColumn($alias . '.ATTRIBUTE_AV_CHAPO');
+            $criteria->addSelectColumn($alias . '.ATTRIBUTE_AV_DESCRIPTION');
+            $criteria->addSelectColumn($alias . '.ATTRIBUTE_AV_POSTSCRIPTUM');
+            $criteria->addSelectColumn($alias . '.CREATED_AT');
+            $criteria->addSelectColumn($alias . '.UPDATED_AT');
+        }
+    }
+
+    /**
+     * Returns the TableMap related to this object.
+     * This method is not needed for general use but a specific application could have a need.
+     * @return TableMap
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function getTableMap()
+    {
+        return Propel::getServiceContainer()->getDatabaseMap(OrderProductAttributeCombinationTableMap::DATABASE_NAME)->getTable(OrderProductAttributeCombinationTableMap::TABLE_NAME);
+    }
+
+    /**
+     * Add a TableMap instance to the database for this tableMap class.
+     */
+    public static function buildTableMap()
+    {
+      $dbMap = Propel::getServiceContainer()->getDatabaseMap(OrderProductAttributeCombinationTableMap::DATABASE_NAME);
+      if (!$dbMap->hasTable(OrderProductAttributeCombinationTableMap::TABLE_NAME)) {
+        $dbMap->addTableObject(new OrderProductAttributeCombinationTableMap());
+      }
+    }
+
+    /**
+     * Performs a DELETE on the database, given a OrderProductAttributeCombination or Criteria object OR a primary key value.
+     *
+     * @param mixed               $values Criteria or OrderProductAttributeCombination object or primary key or array of primary keys
+     *              which is used to create the DELETE statement
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     *                if supported by native driver or if emulated using Propel.
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+     public static function doDelete($values, ConnectionInterface $con = null)
+     {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductAttributeCombinationTableMap::DATABASE_NAME);
+        }
+
+        if ($values instanceof Criteria) {
+            // rename for clarity
+            $criteria = $values;
+        } elseif ($values instanceof \Thelia\Model\OrderProductAttributeCombination) { // it's a model object
+            // create criteria based on pk values
+            $criteria = $values->buildPkeyCriteria();
+        } else { // it's a primary key, or an array of pks
+            $criteria = new Criteria(OrderProductAttributeCombinationTableMap::DATABASE_NAME);
+            $criteria->add(OrderProductAttributeCombinationTableMap::ID, (array) $values, Criteria::IN);
+        }
+
+        $query = OrderProductAttributeCombinationQuery::create()->mergeWith($criteria);
+
+        if ($values instanceof Criteria) { OrderProductAttributeCombinationTableMap::clearInstancePool();
+        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
+            foreach ((array) $values as $singleval) { OrderProductAttributeCombinationTableMap::removeInstanceFromPool($singleval);
+            }
+        }
+
+        return $query->delete($con);
+    }
+
+    /**
+     * Deletes all rows from the order_product_attribute_combination table.
+     *
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).
+     */
+    public static function doDeleteAll(ConnectionInterface $con = null)
+    {
+        return OrderProductAttributeCombinationQuery::create()->doDeleteAll($con);
+    }
+
+    /**
+     * Performs an INSERT on the database, given a OrderProductAttributeCombination or Criteria object.
+     *
+     * @param mixed               $criteria Criteria or OrderProductAttributeCombination object containing data that is used to create the INSERT statement.
+     * @param ConnectionInterface $con the ConnectionInterface connection to use
+     * @return mixed           The new primary key.
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function doInsert($criteria, ConnectionInterface $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductAttributeCombinationTableMap::DATABASE_NAME);
+        }
+
+        if ($criteria instanceof Criteria) {
+            $criteria = clone $criteria; // rename for clarity
+        } else {
+            $criteria = $criteria->buildCriteria(); // build Criteria from OrderProductAttributeCombination object
+        }
+
+        if ($criteria->containsKey(OrderProductAttributeCombinationTableMap::ID) && $criteria->keyContainsValue(OrderProductAttributeCombinationTableMap::ID) ) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key ('.OrderProductAttributeCombinationTableMap::ID.')');
+        }
+
+
+        // Set the correct dbName
+        $query = OrderProductAttributeCombinationQuery::create()->mergeWith($criteria);
+
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table (I guess, conceivably)
+            $con->beginTransaction();
+            $pk = $query->doInsert($con);
+            $con->commit();
+        } catch (PropelException $e) {
+            $con->rollBack();
+            throw $e;
+        }
+
+        return $pk;
+    }
+
+} // OrderProductAttributeCombinationTableMap
+// This is the static code needed to register the TableMap for this table with the main Propel class.
+//
+OrderProductAttributeCombinationTableMap::buildTableMap();
diff --git a/core/lib/Thelia/Model/Map/OrderProductTaxTableMap.php b/core/lib/Thelia/Model/Map/OrderProductTaxTableMap.php
new file mode 100644
index 000000000..2e8460a6a
--- /dev/null
+++ b/core/lib/Thelia/Model/Map/OrderProductTaxTableMap.php
@@ -0,0 +1,463 @@
+<?php
+
+namespace Thelia\Model\Map;
+
+use Propel\Runtime\Propel;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\InstancePoolTrait;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Exception\PropelException;
+use Propel\Runtime\Map\RelationMap;
+use Propel\Runtime\Map\TableMap;
+use Propel\Runtime\Map\TableMapTrait;
+use Thelia\Model\OrderProductTax;
+use Thelia\Model\OrderProductTaxQuery;
+
+
+/**
+ * This class defines the structure of the 'order_product_tax' table.
+ *
+ *
+ *
+ * This map class is used by Propel to do runtime db structure discovery.
+ * For example, the createSelectSql() method checks the type of a given column used in an
+ * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
+ * (i.e. if it's a text column type).
+ *
+ */
+class OrderProductTaxTableMap extends TableMap
+{
+    use InstancePoolTrait;
+    use TableMapTrait;
+    /**
+     * The (dot-path) name of this class
+     */
+    const CLASS_NAME = 'Thelia.Model.Map.OrderProductTaxTableMap';
+
+    /**
+     * The default database name for this class
+     */
+    const DATABASE_NAME = 'thelia';
+
+    /**
+     * The table name for this class
+     */
+    const TABLE_NAME = 'order_product_tax';
+
+    /**
+     * The related Propel class for this table
+     */
+    const OM_CLASS = '\\Thelia\\Model\\OrderProductTax';
+
+    /**
+     * A class that can be returned by this tableMap
+     */
+    const CLASS_DEFAULT = 'Thelia.Model.OrderProductTax';
+
+    /**
+     * The total number of columns
+     */
+    const NUM_COLUMNS = 7;
+
+    /**
+     * The number of lazy-loaded columns
+     */
+    const NUM_LAZY_LOAD_COLUMNS = 0;
+
+    /**
+     * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
+     */
+    const NUM_HYDRATE_COLUMNS = 7;
+
+    /**
+     * the column name for the ID field
+     */
+    const ID = 'order_product_tax.ID';
+
+    /**
+     * the column name for the ORDER_PRODUCT_ID field
+     */
+    const ORDER_PRODUCT_ID = 'order_product_tax.ORDER_PRODUCT_ID';
+
+    /**
+     * the column name for the TITLE field
+     */
+    const TITLE = 'order_product_tax.TITLE';
+
+    /**
+     * the column name for the DESCRIPTION field
+     */
+    const DESCRIPTION = 'order_product_tax.DESCRIPTION';
+
+    /**
+     * the column name for the AMOUNT field
+     */
+    const AMOUNT = 'order_product_tax.AMOUNT';
+
+    /**
+     * the column name for the CREATED_AT field
+     */
+    const CREATED_AT = 'order_product_tax.CREATED_AT';
+
+    /**
+     * the column name for the UPDATED_AT field
+     */
+    const UPDATED_AT = 'order_product_tax.UPDATED_AT';
+
+    /**
+     * The default string format for model objects of the related table
+     */
+    const DEFAULT_STRING_FORMAT = 'YAML';
+
+    /**
+     * holds an array of fieldnames
+     *
+     * first dimension keys are the type constants
+     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
+     */
+    protected static $fieldNames = array (
+        self::TYPE_PHPNAME       => array('Id', 'OrderProductId', 'Title', 'Description', 'Amount', 'CreatedAt', 'UpdatedAt', ),
+        self::TYPE_STUDLYPHPNAME => array('id', 'orderProductId', 'title', 'description', 'amount', 'createdAt', 'updatedAt', ),
+        self::TYPE_COLNAME       => array(OrderProductTaxTableMap::ID, OrderProductTaxTableMap::ORDER_PRODUCT_ID, OrderProductTaxTableMap::TITLE, OrderProductTaxTableMap::DESCRIPTION, OrderProductTaxTableMap::AMOUNT, OrderProductTaxTableMap::CREATED_AT, OrderProductTaxTableMap::UPDATED_AT, ),
+        self::TYPE_RAW_COLNAME   => array('ID', 'ORDER_PRODUCT_ID', 'TITLE', 'DESCRIPTION', 'AMOUNT', 'CREATED_AT', 'UPDATED_AT', ),
+        self::TYPE_FIELDNAME     => array('id', 'order_product_id', 'title', 'description', 'amount', 'created_at', 'updated_at', ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
+    );
+
+    /**
+     * holds an array of keys for quick access to the fieldnames array
+     *
+     * first dimension keys are the type constants
+     * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
+     */
+    protected static $fieldKeys = array (
+        self::TYPE_PHPNAME       => array('Id' => 0, 'OrderProductId' => 1, 'Title' => 2, 'Description' => 3, 'Amount' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ),
+        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'orderProductId' => 1, 'title' => 2, 'description' => 3, 'amount' => 4, 'createdAt' => 5, 'updatedAt' => 6, ),
+        self::TYPE_COLNAME       => array(OrderProductTaxTableMap::ID => 0, OrderProductTaxTableMap::ORDER_PRODUCT_ID => 1, OrderProductTaxTableMap::TITLE => 2, OrderProductTaxTableMap::DESCRIPTION => 3, OrderProductTaxTableMap::AMOUNT => 4, OrderProductTaxTableMap::CREATED_AT => 5, OrderProductTaxTableMap::UPDATED_AT => 6, ),
+        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'ORDER_PRODUCT_ID' => 1, 'TITLE' => 2, 'DESCRIPTION' => 3, 'AMOUNT' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'order_product_id' => 1, 'title' => 2, 'description' => 3, 'amount' => 4, 'created_at' => 5, 'updated_at' => 6, ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
+    );
+
+    /**
+     * Initialize the table attributes and columns
+     * Relations are not initialized by this method since they are lazy loaded
+     *
+     * @return void
+     * @throws PropelException
+     */
+    public function initialize()
+    {
+        // attributes
+        $this->setName('order_product_tax');
+        $this->setPhpName('OrderProductTax');
+        $this->setClassName('\\Thelia\\Model\\OrderProductTax');
+        $this->setPackage('Thelia.Model');
+        $this->setUseIdGenerator(true);
+        // columns
+        $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
+        $this->addForeignKey('ORDER_PRODUCT_ID', 'OrderProductId', 'INTEGER', 'order_product', 'ID', true, null, null);
+        $this->addColumn('TITLE', 'Title', 'VARCHAR', true, 255, null);
+        $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
+        $this->addColumn('AMOUNT', 'Amount', 'FLOAT', true, null, null);
+        $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
+        $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
+    } // initialize()
+
+    /**
+     * Build the RelationMap objects for this table relationships
+     */
+    public function buildRelations()
+    {
+        $this->addRelation('OrderProduct', '\\Thelia\\Model\\OrderProduct', RelationMap::MANY_TO_ONE, array('order_product_id' => 'id', ), 'CASCADE', 'RESTRICT');
+    } // buildRelations()
+
+    /**
+     *
+     * Gets the list of behaviors registered for this table
+     *
+     * @return array Associative array (name => parameters) of behaviors
+     */
+    public function getBehaviors()
+    {
+        return array(
+            'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
+        );
+    } // getBehaviors()
+
+    /**
+     * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
+     *
+     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+     * a multi-column primary key, a serialize()d version of the primary key will be returned.
+     *
+     * @param array  $row       resultset row.
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+     */
+    public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+        // If the PK cannot be derived from the row, return NULL.
+        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+            return null;
+        }
+
+        return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+    }
+
+    /**
+     * Retrieves the primary key from the DB resultset row
+     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+     * a multi-column primary key, an array of the primary key columns will be returned.
+     *
+     * @param array  $row       resultset row.
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+     *
+     * @return mixed The primary key of the row
+     */
+    public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+
+            return (int) $row[
+                            $indexType == TableMap::TYPE_NUM
+                            ? 0 + $offset
+                            : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
+                        ];
+    }
+
+    /**
+     * The class that the tableMap will make instances of.
+     *
+     * If $withPrefix is true, the returned path
+     * uses a dot-path notation which is translated into a path
+     * relative to a location on the PHP include_path.
+     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
+     *
+     * @param boolean $withPrefix Whether or not to return the path with the class name
+     * @return string path.to.ClassName
+     */
+    public static function getOMClass($withPrefix = true)
+    {
+        return $withPrefix ? OrderProductTaxTableMap::CLASS_DEFAULT : OrderProductTaxTableMap::OM_CLASS;
+    }
+
+    /**
+     * Populates an object of the default type or an object that inherit from the default.
+     *
+     * @param array  $row       row returned by DataFetcher->fetch().
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+                                 One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     * @return array (OrderProductTax object, last column rank)
+     */
+    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+        $key = OrderProductTaxTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
+        if (null !== ($obj = OrderProductTaxTableMap::getInstanceFromPool($key))) {
+            // We no longer rehydrate the object, since this can cause data loss.
+            // See http://www.propelorm.org/ticket/509
+            // $obj->hydrate($row, $offset, true); // rehydrate
+            $col = $offset + OrderProductTaxTableMap::NUM_HYDRATE_COLUMNS;
+        } else {
+            $cls = OrderProductTaxTableMap::OM_CLASS;
+            $obj = new $cls();
+            $col = $obj->hydrate($row, $offset, false, $indexType);
+            OrderProductTaxTableMap::addInstanceToPool($obj, $key);
+        }
+
+        return array($obj, $col);
+    }
+
+    /**
+     * The returned array will contain objects of the default type or
+     * objects that inherit from the default.
+     *
+     * @param DataFetcherInterface $dataFetcher
+     * @return array
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function populateObjects(DataFetcherInterface $dataFetcher)
+    {
+        $results = array();
+
+        // set the class once to avoid overhead in the loop
+        $cls = static::getOMClass(false);
+        // populate the object(s)
+        while ($row = $dataFetcher->fetch()) {
+            $key = OrderProductTaxTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
+            if (null !== ($obj = OrderProductTaxTableMap::getInstanceFromPool($key))) {
+                // We no longer rehydrate the object, since this can cause data loss.
+                // See http://www.propelorm.org/ticket/509
+                // $obj->hydrate($row, 0, true); // rehydrate
+                $results[] = $obj;
+            } else {
+                $obj = new $cls();
+                $obj->hydrate($row);
+                $results[] = $obj;
+                OrderProductTaxTableMap::addInstanceToPool($obj, $key);
+            } // if key exists
+        }
+
+        return $results;
+    }
+    /**
+     * Add all the columns needed to create a new object.
+     *
+     * Note: any columns that were marked with lazyLoad="true" in the
+     * XML schema will not be added to the select list and only loaded
+     * on demand.
+     *
+     * @param Criteria $criteria object containing the columns to add.
+     * @param string   $alias    optional table alias
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function addSelectColumns(Criteria $criteria, $alias = null)
+    {
+        if (null === $alias) {
+            $criteria->addSelectColumn(OrderProductTaxTableMap::ID);
+            $criteria->addSelectColumn(OrderProductTaxTableMap::ORDER_PRODUCT_ID);
+            $criteria->addSelectColumn(OrderProductTaxTableMap::TITLE);
+            $criteria->addSelectColumn(OrderProductTaxTableMap::DESCRIPTION);
+            $criteria->addSelectColumn(OrderProductTaxTableMap::AMOUNT);
+            $criteria->addSelectColumn(OrderProductTaxTableMap::CREATED_AT);
+            $criteria->addSelectColumn(OrderProductTaxTableMap::UPDATED_AT);
+        } else {
+            $criteria->addSelectColumn($alias . '.ID');
+            $criteria->addSelectColumn($alias . '.ORDER_PRODUCT_ID');
+            $criteria->addSelectColumn($alias . '.TITLE');
+            $criteria->addSelectColumn($alias . '.DESCRIPTION');
+            $criteria->addSelectColumn($alias . '.AMOUNT');
+            $criteria->addSelectColumn($alias . '.CREATED_AT');
+            $criteria->addSelectColumn($alias . '.UPDATED_AT');
+        }
+    }
+
+    /**
+     * Returns the TableMap related to this object.
+     * This method is not needed for general use but a specific application could have a need.
+     * @return TableMap
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function getTableMap()
+    {
+        return Propel::getServiceContainer()->getDatabaseMap(OrderProductTaxTableMap::DATABASE_NAME)->getTable(OrderProductTaxTableMap::TABLE_NAME);
+    }
+
+    /**
+     * Add a TableMap instance to the database for this tableMap class.
+     */
+    public static function buildTableMap()
+    {
+      $dbMap = Propel::getServiceContainer()->getDatabaseMap(OrderProductTaxTableMap::DATABASE_NAME);
+      if (!$dbMap->hasTable(OrderProductTaxTableMap::TABLE_NAME)) {
+        $dbMap->addTableObject(new OrderProductTaxTableMap());
+      }
+    }
+
+    /**
+     * Performs a DELETE on the database, given a OrderProductTax or Criteria object OR a primary key value.
+     *
+     * @param mixed               $values Criteria or OrderProductTax object or primary key or array of primary keys
+     *              which is used to create the DELETE statement
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     *                if supported by native driver or if emulated using Propel.
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+     public static function doDelete($values, ConnectionInterface $con = null)
+     {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductTaxTableMap::DATABASE_NAME);
+        }
+
+        if ($values instanceof Criteria) {
+            // rename for clarity
+            $criteria = $values;
+        } elseif ($values instanceof \Thelia\Model\OrderProductTax) { // it's a model object
+            // create criteria based on pk values
+            $criteria = $values->buildPkeyCriteria();
+        } else { // it's a primary key, or an array of pks
+            $criteria = new Criteria(OrderProductTaxTableMap::DATABASE_NAME);
+            $criteria->add(OrderProductTaxTableMap::ID, (array) $values, Criteria::IN);
+        }
+
+        $query = OrderProductTaxQuery::create()->mergeWith($criteria);
+
+        if ($values instanceof Criteria) { OrderProductTaxTableMap::clearInstancePool();
+        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
+            foreach ((array) $values as $singleval) { OrderProductTaxTableMap::removeInstanceFromPool($singleval);
+            }
+        }
+
+        return $query->delete($con);
+    }
+
+    /**
+     * Deletes all rows from the order_product_tax table.
+     *
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).
+     */
+    public static function doDeleteAll(ConnectionInterface $con = null)
+    {
+        return OrderProductTaxQuery::create()->doDeleteAll($con);
+    }
+
+    /**
+     * Performs an INSERT on the database, given a OrderProductTax or Criteria object.
+     *
+     * @param mixed               $criteria Criteria or OrderProductTax object containing data that is used to create the INSERT statement.
+     * @param ConnectionInterface $con the ConnectionInterface connection to use
+     * @return mixed           The new primary key.
+     * @throws PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function doInsert($criteria, ConnectionInterface $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(OrderProductTaxTableMap::DATABASE_NAME);
+        }
+
+        if ($criteria instanceof Criteria) {
+            $criteria = clone $criteria; // rename for clarity
+        } else {
+            $criteria = $criteria->buildCriteria(); // build Criteria from OrderProductTax object
+        }
+
+        if ($criteria->containsKey(OrderProductTaxTableMap::ID) && $criteria->keyContainsValue(OrderProductTaxTableMap::ID) ) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key ('.OrderProductTaxTableMap::ID.')');
+        }
+
+
+        // Set the correct dbName
+        $query = OrderProductTaxQuery::create()->mergeWith($criteria);
+
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table (I guess, conceivably)
+            $con->beginTransaction();
+            $pk = $query->doInsert($con);
+            $con->commit();
+        } catch (PropelException $e) {
+            $con->rollBack();
+            throw $e;
+        }
+
+        return $pk;
+    }
+
+} // OrderProductTaxTableMap
+// This is the static code needed to register the TableMap for this table with the main Propel class.
+//
+OrderProductTaxTableMap::buildTableMap();
diff --git a/core/lib/Thelia/Model/OrderProductAttributeCombination.php b/core/lib/Thelia/Model/OrderProductAttributeCombination.php
new file mode 100644
index 000000000..1f9cee13d
--- /dev/null
+++ b/core/lib/Thelia/Model/OrderProductAttributeCombination.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Thelia\Model;
+
+use Thelia\Model\Base\OrderProductAttributeCombination as BaseOrderProductAttributeCombination;
+
+        class OrderProductAttributeCombination extends BaseOrderProductAttributeCombination
+{
+
+}
diff --git a/core/lib/Thelia/Model/OrderProductAttributeCombinationQuery.php b/core/lib/Thelia/Model/OrderProductAttributeCombinationQuery.php
new file mode 100644
index 000000000..f2d6a6ddc
--- /dev/null
+++ b/core/lib/Thelia/Model/OrderProductAttributeCombinationQuery.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Thelia\Model;
+
+use Thelia\Model\Base\OrderProductAttributeCombinationQuery as BaseOrderProductAttributeCombinationQuery;
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'order_product_attribute_combination' 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 OrderProductAttributeCombinationQuery extends BaseOrderProductAttributeCombinationQuery
+{
+
+} // OrderProductAttributeCombinationQuery
diff --git a/core/lib/Thelia/Model/OrderProductTax.php b/core/lib/Thelia/Model/OrderProductTax.php
new file mode 100644
index 000000000..6091c3099
--- /dev/null
+++ b/core/lib/Thelia/Model/OrderProductTax.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Thelia\Model;
+
+use Thelia\Model\Base\OrderProductTax as BaseOrderProductTax;
+
+        class OrderProductTax extends BaseOrderProductTax
+{
+
+}
diff --git a/core/lib/Thelia/Model/OrderProductTaxQuery.php b/core/lib/Thelia/Model/OrderProductTaxQuery.php
new file mode 100644
index 000000000..f4bbaaa3d
--- /dev/null
+++ b/core/lib/Thelia/Model/OrderProductTaxQuery.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Thelia\Model;
+
+use Thelia\Model\Base\OrderProductTaxQuery as BaseOrderProductTaxQuery;
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'order_product_tax' 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 OrderProductTaxQuery extends BaseOrderProductTaxQuery
+{
+
+} // OrderProductTaxQuery