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

47 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
Rémi Gaillard
8be339463d // small fix 2013-11-12 12:36:51 +01:00
Rémi Gaillard
e1887425fa [*] BO: Add an option to choose to not import the behavior of taxes displaying for the groups in localization pack import 2013-10-23 18:22:53 +02:00
jeromenadaud
e1b7470845 [-] BO : FixBug Install currency on Localization Pack 2013-07-31 09:38:10 +02:00
Jérôme Nadaud
0ecc2fb0a0 [-] BO : FixBug #PSCFV-9965 currency not active by default in Localization pack 2013-07-29 18:36:55 +02:00
Damien Metzger
0e75dbdbf8 [*] BO : attributes taken into account for the language entity in the localization packs 2013-06-06 18:53:51 +02:00
Rémi Gaillard
9a326bd844 // Also update the tax display for unidentified and guest group on localization import 2013-04-24 19:01:10 +02:00
Rémi Gaillard
ed10d9f58c // Fix the display of errors on adding localization pack 2013-03-25 15:54:19 +01:00
Rémi Gaillard
2dac1e211c // install languages on installer part 2 2013-03-21 18:32:27 +01:00
Rémi Gaillard
8244e15408 // Clean Language::checkAndAddLanguage() 2013-03-15 11:14:29 +01:00
Rémi Gaillard
8625f39c07 // oops 2013-03-11 15:06:57 +01:00
Rémi Gaillard
68c9da5f25 [-] Installer: download the language pack even if this is a native language on installation 2013-03-11 15:03:38 +01:00
vAugagneur
9154984c78 [-] CORE : fixed bug #PSCFV-4523 - Static _PS_DEFAULT_CUSTOMER_GROUP_ is still use in code even if deprecated 1.5.0.1 2013-01-09 10:26:16 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
dMetzger
74dd114c65 // Update brazilian translations 2012-10-04 09:28:19 +00:00
lLefevre
c976312ac9 // Small fix 2012-10-03 08:21:50 +00:00
dMetzger
05e8c68a49 // Fixed taxes in localization packs 2012-09-27 08:03:01 +00:00
dMetzger
9f2800d0e9 // Improved localization pack import at the installation #PSCFV-4404 2012-09-26 08:12:54 +00:00
dMetzger
4909565d15 [-] Installer : install failed when you had an exotic (i.e. not by default in the installer) default country/language #PSCFV-3891 2012-09-05 08:00:49 +00:00
rGaillard
4d5f118a88 // Fix link 2012-08-24 15:31:40 +00:00
rMalie
af855321ab // Fix default id lang in localization packs 2012-06-20 08:36:51 +00:00
dMetzger
f5f9a96bf7 // Translations 2012-05-22 09:20:26 +00:00
vSchoener
97d0dd9ebd [-] BO : Delete accounting 2012-05-10 09:30:04 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
vSchoener
adf5e19bbd // fix norme 2012-03-09 14:38:40 +00:00
vSchoener
df3bd0e146 [-] BO : Update Accounting geolocalization for France 2012-03-09 14:36:43 +00:00
vSchoener
6e20705072 [-] BO : Make a lot of changement on the Accounting (accouting plan / configuration / customer) 2012-03-08 17:21:23 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
bMancone
85f3df042f // Fixed missing parameters when calling Currency::exists 2012-02-20 09:22:15 +00:00
Francois Gaillard
0a5dc876e3 [*] TR : #PSTEST-553 : Replaced can't with cannot 2012-01-30 12:54:32 +00:00
fBrignoli
dcfd95f959 [-] Installer : Currency not installed when offline 2012-01-26 17:31:19 +00:00
rMalie
d2ae1b632a // Normalize 2012-01-24 17:30:33 +00:00
rMalie
b2b678ab3d // Improve collections : where() method reworked (prototype changed) + validation of fields 2011-12-19 16:57:28 +00:00
rGaillard
c0ce9cc965 // Change URLs calling for prestashop.com 2011-11-25 18:45:07 +00:00
rMalie
c4780ec67d // Merge -> revision 8984 2011-10-03 15:48:07 +00:00
fBrignoli
5f9b669cf9 [-] LO : Undefined field description 2011-09-20 15:45:48 +00:00
fBrignoli
c57b593873 [*] LO : FR now has a Corse Zone defined 
[*] LO : CA Taxes
 2011-09-19 14:03:56 +00:00
fBrignoli
8f8ac0670d [*] Project : US + CA TaxSystem 2011-08-18 10:10:50 +00:00
rMalie
d0dbb5c185 // Merge -> revision 8014 2011-08-11 12:00:05 +00:00
rMalie
c17e7c236d // MERGE with 1.4 r7770 2011-07-28 09:20:57 +00:00
rGaillard
8fc7f11014 2011-07-06 10:54:11 +00:00
rGaillard
d1a13007b9 2011-07-06 10:10:43 +00:00
aFolletete
05a58f53e6 // 1.5 branche creation 2011-04-12 18:24:40 +00:00