Commit Graph
5012 Commits
Author SHA1 Message Date
aFolletete 192588b4b3 // update ThemeInstallator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14885 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 16:16:25 +00:00
rMalie 9eb7fdec16 // Add retro-compatibility support for tabs in Tab::add() method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14883 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 15:58:02 +00:00
rMalie 40ece86d13 // FileLogger is now called after configuration in installer in order to prevent permissions problems on log/ folder
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14880 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 15:25:04 +00:00
mDeflotte 575f5a2e80 // Blocklayered: Fix bug with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14877 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 14:16:25 +00:00
mDeflotte cda859ab30 [-] FO : #PSFV-813 - Fix bug with cart rule discount rounding price and price validator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14875 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 13:41:41 +00:00
rMalie 4cdb580608 // Add all missing duplicated data for shop duplication
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14873 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 13:24:09 +00:00
rMalie b0d9af537e // Fix duplication of product_attributes for multishop #PSTEST-1174
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14872 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 13:01:28 +00:00
dMetzger c1d7658749 [-] FO : sometimes the cart rules total was doubled - fixed! #PSTEST-1202
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14871 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 12:58:35 +00:00
mDeflotte 2659bd8929 [-] BO : #PSTEST-853 - Change field description
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14869 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 12:25:19 +00:00
mDeflotte ae5fd0b74c [-] MO : #PSTEST-1181 - blockcurrencies bug with catalog mode
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14868 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 12:13:08 +00:00
rMalie 728fb6d651 // Fix problem on configuration context for mono-shop mode #PSTEST-1231
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14867 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 09:54:28 +00:00
rMalie 64b83ee40e // Add hooks for shop duplication, fix homeslider duplication #PSTEST-1173
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14864 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 09:04:38 +00:00
mDeflotte f73397db89 [-] FO : #PSFV-813 - Fix bug with partial cartrules and free order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14863 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 08:51:13 +00:00
vChabot 4612b511ca [-] BO : BugFix #PSTEST-1137 Customers : Accounting export comment is now improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14862 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 08:37:14 +00:00
tDidierjean 73b9169f4c // fix virtual product combination check
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14861 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 08:23:57 +00:00
rMalie 6d90aaec1c // Version 1.5.0.10
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14860 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 08:06:19 +00:00
dMetzger 0af6a2f360 [-] FO : cart rules are now removed when the cart is empty #PSTEST-1205
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14858 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 17:10:32 +00:00
tDidierjean 2a97927eba // #PSTEST-1229 - make sure you cannot select virtual product if you have combinations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14857 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 16:45:00 +00:00
rMalie 26520b40a7 // Admin thumbnails are not cached #PSTEST-1073
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14854 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 15:19:04 +00:00
vChabot 79e53679b5 // product import improved (image problem because of file_exists PHP function)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14852 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 14:39:29 +00:00
aFolletete 67642bac3a // clean code #PI-135
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14848 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 13:48:50 +00:00
rMalie 21037010d2 // Fix multishop bug on product_attribute list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14847 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 13:48:23 +00:00
lLefevre 336fd07a4e [-] BO : Fix #PSFV-549 : Now two customer with the same mail, isn't possible
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14845 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 13:42:43 +00:00
tDidierjean 8f4a8b1b5c // #PSTEST-1229 - remove virtual combinations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14844 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 13:23:02 +00:00
lLefevre 142bb01271 [-] BO : Fix #PSTEST-1220 : now position update for attribute value is good && fix JavaScript error in admin-dnd.js
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14843 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 12:59:17 +00:00
fSerny 9dd67bfb90 [-] BO : Fixing missing translation on title attribute AdminModules #PSTEST-1201
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14842 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 09:59:27 +00:00
lLefevre 2fa47bf4b5 [-] BO : Fix #PSTEST-1217 : fatal error when all carrier are free
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14841 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 09:51:03 +00:00
rMalie d6f7da35ab // Fix list of adminProducts (was called twice, causing a bug on multishop product lang)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14837 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 09:15:19 +00:00
rMalie 92b27f5caf // Fix list of suppliers for multishop #PSTEST-1194
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14835 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 09:01:40 +00:00
mDeflotte e6348e694d [-] BO : #PSFV-434 - Fix bugs with invoice icons not visible for orders canceled
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14834 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 08:47:57 +00:00
lLefevre 13c2b91ff6 // Now translation in validateRules() method uses sprintf
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14832 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 08:28:10 +00:00
lLefevre f6cf5fdf88 [-] BO : Fix #PSTEST-1185
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14828 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 16:17:20 +00:00
bMancone f0af3c1212 // Fixed #PSFV-894 : homeslider improvements
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14827 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 16:01:10 +00:00
rMalie a7f719a1c6 // Fix javascript in installer (jQuery update) #PSTEST-1224
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14826 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 15:46:34 +00:00
mDeflotte 77232f234f // Blocklayered: Fix translation problem with category url indexing
// Blocklayered: Adding missing translation

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14824 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 15:16:28 +00:00
tDidierjean efe2c50d4d [-] BO : fix #PSTEST-697 - remove cancel button in category list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14823 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 15:06:32 +00:00
rMalie 80f238df73 // Fix helper translations for shops #PSTEST-1121
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14822 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 14:59:42 +00:00
mDeflotte 584906d9b0 // Fix little html norme problem
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14821 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 14:27:43 +00:00
rMalie b9fe1bb36b // Add a multishop restriction on address in BO #PSTEST-1035
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14820 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 14:27:08 +00:00
lLefevre ef1db4105c [-] BO : Fix #PSTEST-1182 : Now the number of available products displaying
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14819 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 14:12:26 +00:00
vChabot ba8049264f [-] BO : BugFix : #PSTEST-1190 : email customer verification improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14817 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 13:45:23 +00:00
rMalie fb45b9d71e // Add a redirection in Tools::switchLanguage() to prevent problems with friendly url #PSFV-705
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14816 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 13:44:47 +00:00
lLefevre 6683903b1a [-] BO : Fix #PSFV-868 : Unity price can be set
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14815 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 13:41:36 +00:00
rMalie e50fa1ae2a // Fix // Fix left join on product_attribute_shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14813 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 13:29:24 +00:00
lLefevre 64720081ef [-] BO : #PSTEST-1207 : Fix translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14812 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 13:10:00 +00:00
lLefevre 6b387a1e43 [-] BO : PSTEST-1216 : Fix translations lost
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14811 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 13:07:32 +00:00
rMalie 0be8cc5693 // Fix left join on product_attribute_shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14809 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 13:01:02 +00:00
rMalie 54b39b1eaa // Fix BO connection bug with employees auth
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14808 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 12:25:06 +00:00
rMalie 278ec73d66 // Fix BO connection bug with employees auth
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14807 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 12:07:26 +00:00
lLefevre 7aa2055a80 [-] BO : #PSTEST-1204 : fix translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14806 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 10:38:07 +00:00