Add function to display/calculate VAT and untaxed postage
add loop OrderProductTax
change condition when cart is duplicated
add order parameter to BaseSpecificModule loop
Update Customer.php

correction du texte d'erreur si le message n'est pas trouvé.
Fix prev_page usage in pagination
	modified:   templates/backOffice/default/includes/pagination.html
Merge pull request #699 from lovenunu/pagination-tpl

Fix prev_page usage in pagination
fix modification product quantity when status order is cancel
Merge pull request #702 from Alban-io/2.0-updateStock

fix modification product quantity when status order is cancel
Add function to display/calculate VAT and untaxed postage
Merge branch 'patch-vat' of https://github.com/griotteau/thelia into patch-vat
644 rights on files
Merge pull request #672 from griotteau/patch-vat

Add function to display/calculate VAT and untaxed postage
Add a code filter for module loop
Merge pull request #720 from griotteau/patch-loop

Add a code filter for module loop
Conditional structure Syntax

Conflicts:
	local/modules/Tinymce/Smarty/TinyMCELanguage.php
[templates] fixed french translation
Merge pull request #733 from hhamon/fr-translation-fix

[templates] fixed french translation
Thelia no longer fails if a module can't be loaded

Conflicts:
	core/lib/Thelia/Core/Thelia.php
version info enhancement