diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d5355019..bd7c7078c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
#2.0.0-beta4
- Tinymce is now a dedicated module. You need to activate it.
- Fix PDF creation. Bug #180
-- Fix many translation issues.
+- Fix many translation issues.
+- The TaxManager is now a service
#2.0.0-beta3
- Coupon effect inputs are now more customisable (input text, select, ajax, etc.. are usable) and unlimited amount of input for coupon effect are now possible too
diff --git a/templates/backOffice/default/includes/product-prices-tab.html b/templates/backOffice/default/includes/product-prices-tab.html
new file mode 100644
index 000000000..32aa42af6
--- /dev/null
+++ b/templates/backOffice/default/includes/product-prices-tab.html
@@ -0,0 +1,770 @@
+
{intl
+ l='This product has no combination. The default price is used. Click here to create a new combination.'
+ url='#combination_creation_dialog'
+ }
+
+ {intl
+ l='You may also quickly create combinations from products attributes using the Combination Builder.'
+ url='#combination_builder_dialog'
+ }
+
+
+{* -- Adding a new combination ------------------------------------------------- *}
+
+{* Capture the dialog body, to pass it to the generic dialog *}
+
+{capture "combination_creation_dialog"}
+
+
+
+
+
+
+
+ {intl l='Select an attribute and click (+) to view available values'}
+
+
+
+
+
+ {* *}
+
+
+
+
+
+
+
+
+ {intl l='Select a value click (+) to add it to the combination'}
+
+
+
+
+ {intl l="No available value for this attribute"}
+
+
+
+
+
+
+
+
+
+ {intl l='To remove a value from the combination, select it and click "remove"'}
+
+
+
+
+
+
+
+{/capture}
+
+{include
+ file = "includes/generic-create-dialog.html"
+
+ dialog_id = "combination_creation_dialog"
+ dialog_title = {intl l="Create a new combination"}
+ dialog_body = {$smarty.capture.combination_creation_dialog nofilter}
+
+ dialog_ok_label = {intl l="Create this combination"}
+
+ form_action = {url path='/admin/product/combination/add'}
+ form_enctype = ''
+ form_error_message = ''
+
+ ok_button_id = "combination_creation_dialog_ok"
+}
+
+
+{* -- Delete combination confirmation dialog ----------------------------------- *}
+
+{capture "combination_delete_dialog"}
+
+
+
+
+
+
+ {module_include location='category_delete_form'}
+
+{/capture}
+
+{include
+ file = "includes/generic-confirm-dialog.html"
+
+ dialog_id = "combination_delete_dialog"
+ dialog_title = {intl l="Delete a combination"}
+ dialog_message = {intl l="Do you really want to delete this combination ?"}
+
+ form_action = {url path='/admin/product/combination/delete'}
+ form_content = {$smarty.capture.combination_delete_dialog nofilter}
+}
+
+{* -- Combination builder dialog -------------------------------------------- *}
+
+{* Capture the dialog body, to pass it to the generic dialog *}
+
+{form name="thelia.admin.product_combination.build"}
+
+{capture "combination_builder_dialog"}
+
+ {* Be sure to get the product ID and current tab, even if the form could not be validated *}
+
+
+
+ {form_hidden_fields form=$form}
+
+ {form_field form=$form field='product_id'}
+
+ {/form_field}
+
+ {if $form_error}