Kevin Granger
|
9eefcfd058
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/css/modules.css
admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/products/images.tpl
admin-dev/themes/default/template/controllers/products/prices.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/list/list_header.tpl
classes/Autoload.php
classes/Carrier.php
classes/Product.php
classes/ProductSale.php
classes/Tools.php
classes/Validate.php
classes/tax/TaxRulesTaxManager.php
controllers/admin/AdminPPreferencesController.php
controllers/admin/AdminPerformanceController.php
install-dev/install_version.php
js/admin_carrier_wizard.js
modules/blockcategories/blockcategories.php
modules/blocklayered/blocklayered.php
modules/statsequipment/statsequipment.php
modules/statsproduct/statsproduct.php
modules/watermark/watermark.php
themes/default/address.tpl
themes/default/authentication.tpl
themes/default/category.tpl
themes/default/contact-form.tpl
themes/default/css/history.css
themes/default/header.tpl
themes/default/js/cart-summary.js
themes/default/js/product.js
themes/default/mobile/order-detail.tpl
themes/default/modules/blocksearch/blocksearch.tpl
themes/default/modules/productcomments/productcomments.tpl
themes/default/order-carrier.tpl
themes/default/order-detail.tpl
themes/default/order-opc-new-account.tpl
themes/default/product.tpl
|
2013-11-21 17:43:51 +01:00 |
|
Damien Metzger
|
63f2082da3
|
[-] FO : fixed tax rules cache
|
2013-11-20 16:49:48 +01:00 |
|
gRoussac
|
3f9338e13d
|
[*] CORE : Cache store for isAssociatedToShop::isAssociatedToShop
|
2013-11-11 01:59:10 +01:00 |
|
gRoussac
|
38da826671
|
[-] FO : getTaxCalculator bad cache key again // sorry about that
|
2013-11-11 01:37:20 +01:00 |
|
gRoussac
|
7e93b2cffd
|
[-] FO : getTaxCalculator bad cache key
|
2013-11-11 00:13:35 +01:00 |
|
gRoussac
|
f94f0f14a4
|
[-] FO : Fix bug #PSCFV-8917 taxes calculation when changing delivery address
|
2013-09-10 18:48:28 +02:00 |
|
Rémi Gaillard
|
963af9ca30
|
// perf optimization
|
2013-01-07 14:44:14 +01:00 |
|
François Gaillard
|
064ba453e6
|
// Welcome 2013
|
2013-01-04 11:19:03 +01:00 |
|
Rémi Gaillard
|
4320f4c30c
|
[-] Core: Fix #PSCFV-6162 - can't add no tax for specific zip code or state
|
2012-12-17 12:29:29 +01:00 |
|
vAugagneur
|
768fcf8f84
|
Merge pull request #75 from @sebastienhouzet
|
2012-12-12 11:24:56 +01:00 |
|
vAugagneur
|
a1db83ef41
|
//remove svn keyword @version Release: $
|
2012-11-22 11:57:40 +01:00 |
|
lLefevre
|
779cf350af
|
// Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 09:29:43 +00:00 |
|
lLefevre
|
046b51ab99
|
// #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 06:18:59 +00:00 |
|
fBrignoli
|
d28d7e63c1
|
[-] FO : Bug Fixed #PSCFV-3417 - Wrong total order price calculation with tax disabled
|
2012-07-31 12:18:10 +00:00 |
|
rMalie
|
5b8e96602f
|
// Use protected instead of private for classes we can override #PSCFV-1976
|
2012-04-26 08:55:55 +00:00 |
|
rMalie
|
14e6929565
|
// Welcome 2012²
|
2012-02-23 16:33:10 +00:00 |
|
fBrignoli
|
b51f129bb8
|
// additional comment
|
2011-11-18 09:32:49 +00:00 |
|
fBrignoli
|
4a8a9e0398
|
[-] FO : TaxRulesTaxManager cache not refreshed
|
2011-10-13 08:40:57 +00:00 |
|
rMalie
|
9510337b1d
|
// Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names
|
2011-10-10 12:18:56 +00:00 |
|
fBrignoli
|
8915f989ed
|
// cache on getTaxCalculator()
|
2011-10-03 12:43:05 +00:00 |
|
fBrignoli
|
f631d8fc53
|
// problem with zipcode containing letters
|
2011-09-26 08:03:52 +00:00 |
|
fBrignoli
|
efbf3c5d45
|
[*] BO : Taxes are now historized
[*] BO : Taxes are no longer stored in the order details row
|
2011-09-14 09:06:20 +00:00 |
|
fBrignoli
|
8f8ac0670d
|
[*] Project : US + CA TaxSystem
|
2011-08-18 10:10:50 +00:00 |
|