dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,989 Commits 9 Branches 19 Tags
0af76e01fb303fa6eeb7ee7a78755d2bc8dfd708
Commit Graph

65 Commits

Author SHA1 Message Date
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
036e2362c9 [+] CORE : Fixed cache_id 2013-11-12 17:09:38 +01:00
gRoussac
a7869a1f06 [*] CORE : Remove duplicate SQL queries 2013-11-11 13:41:23 +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
907d81c32e // duplication of tax_rules_group on adminproducts with multishop 2013-08-22 10:53:50 +02:00
Jérôme Nadaud
458838e598 [-] BO : FixBug #PSCFV-9613 Fix product tax to be shop dependent 2013-07-17 17:33:53 +02:00
Rémi Gaillard
8d39f32506 [-] BO: Fix tax rule edition - unique tax rule can't be edited 2013-07-16 11:52:05 +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
rGaillard
ee62ed8d27 [-] BO: FIX #PSCFV-5088 - cant add a tax rule to a group if one have already defined as unique 2012-11-16 16:48:23 +00:00
rGaillard
59a602c274 [-] Core: Fix products duplication when using multiple taxe rule on the same country 2012-11-16 16:08:21 +00:00
rGaillard
d99a7c4394 [-] BO: Fix #PSCFV-5263 tax rule deletion on tax rules group deletion 2012-11-15 14:01:36 +00:00
lLefevre
946dd2caf7 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre
04fc63c2b6 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +00: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
lLefevre
9239de5dac [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
rGaillard
dbc87aa0b0 // Fix some bug within sharing orders between shops 2012-10-02 10:21:04 +00:00
dMetzger
d9f2fc5a36 // Fixed retro-compatibility issue 2012-09-05 10:22:31 +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
fBrignoli
af7bfbfd2e [-] PDF : Canadian taxes 2012-07-12 16:45:14 +00:00
rGaillard
372a6fc472 // Performance optimizations 2012-05-29 08:32:13 +00:00
lLefevre
502358f444 [-] BO : fix #PSCFV-2480 : fix translations 2012-05-22 12:42:58 +00:00
lLefevre
2c129a8db1 [-] BO : #PSCFV-731 : change type int by string for zipcode_from and zipcode_to 
&& check this zip codes
 && display errors
 && normalize
 2012-05-10 15:50:44 +00:00
vSchoener
a43d2f3b52 [-] BO : Delete accounting 2012-05-10 09:30:04 +00:00
rMalie
5b8e96602f // Use protected instead of private for classes we can override #PSCFV-1976 2012-04-26 08:55:55 +00:00
vChabot
4c83342b9c [-] BO : BugFix : #PSTEST-952 : Tax rules group sorted by name ASC 2012-03-05 14:00:04 +00:00
rMalie
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
aKorczak
641d84a277 [-] WS : Fix xlink 
[*] WS : Add entity tax_rule_groups
[*] WS : Fix ObjectModel issue
[*] WS : Delete sqlId not used
[*] WS : Fix entity configurations
[*] WS : Fix entity translated_configurations
 2012-02-08 15:42:53 +00:00
rMalie
1075d3e98b // Normalize 2012-01-25 14:45:32 +00:00
vChabot
e79d8ee10b // code review AdminTaxRulesGroup 2012-01-20 16:16:02 +00:00
fBrignoli
14c9eec92a // webservice 2012-01-09 17:00:57 +00:00
mDeflotte
fca37421ac [-] BO : #PSTEST-263 - Add attribute multilang to Tax class definition 2012-01-02 17:19:11 +00:00
rMalie
ff3f1804ec // Change prototype of methods from(), leftJoin(), innerJoin(), leftOuterJoin() and naturalJoin() for DbQuery class 2011-12-19 11:13:13 +00:00
rMalie
8fa5ffc681 [*] Classes: ObjectModel::getTranslationsField|Child() is now deprecated, use ObjectModel::getFieldsLang() if need instead 2011-12-15 13:24:03 +00:00
rMalie
d1c9c439fd // Format definitions 2011-12-13 16:34:09 +00:00
rMalie
48baf36558 [*] Classes: Remove $fieldsRequired, $fieldsSize and $fieldsValidate (and lang properties) properties, use $definition instead 2011-12-12 18:10:38 +00:00
rMalie
d3a24b8622 // Remove $table and $identifier property from all classes, and add static $definition instead 2011-12-05 13:56:03 +00:00
fBrignoli
b51f129bb8 // additional comment 2011-11-18 09:32:49 +00:00
fBrignoli
fddc403a09 [*] PDF : PDF is now rendered by TCPDF throught HTML template 2011-11-17 17:15:23 +00:00
vSchoener
8c11276d3e // Update Accounting for export 2011-11-15 14:45:24 +00:00
lLefevre
b776d6cc4f [*] BO #PSFV-94 : Added AdminTaxRulesGroupController 2011-11-03 09:46:58 +00:00
fBrignoli
f0d0ab181f // todo are done 2011-10-13 15:15:21 +00:00