Commit Graph

4997 Commits

Author SHA1 Message Date
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
lLefevre 610d582d0f // Fix deutsch subject mail and encoding characters in mails
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14805 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 09:42:13 +00:00
rMalie 60a140c91f // Fix bug on auths for sub employees #PSFV-849
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14804 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 09:38:24 +00:00
tDidierjean a8569d1496 [-] BO : fix #PSTEST-1213 - button style
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14803 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 09:34:05 +00:00
lLefevre 560c2bee11 // Refacto AdminTranslationsController : normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14802 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 09:18:52 +00:00
bMancone 53821dd3ad // When viewing an order, a warning is now displayed if one/some product(s) are out of stock - #PSTEST-821
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14801 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 08:26:10 +00:00
bMancone 9ea9bd183c // When viewing an order, the stock_available is now properly displayed.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14800 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 08:15:23 +00:00
lLefevre b5d6b66f24 // Refacto AdminTranslationsController : now you can translated your files by themes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14799 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 08:11:54 +00:00
mDeflotte 0725c86495 // Fix bug with block cart and customizations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14798 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 07:16:27 +00:00
fBrignoli d22fde6176 [*] Project : Jquery 1.7.2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14792 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-20 15:45:43 +00:00
vChabot d788baee35 // add condition isProductFieldUpdated to product and category association
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14790 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-20 15:26:41 +00:00
vChabot 5f8c6bdec4 // product categories now handle the multiple category trees
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14789 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-20 15:13:08 +00:00
mDeflotte d4274b6054 [-] FO : #PSFV-803 - Fix bugs with customization and cart summary
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14788 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-20 14:55:21 +00:00
rMalie 33d8a79b0b // Combination multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14786 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-20 10:01:05 +00:00
mDeflotte 3eeb6640fa // Order::getHistory() Fix cache problem
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14783 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-20 08:47:29 +00:00
mDeflotte 19956fa86c // Blocklayered: Fix bugs with blocklayered
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14781 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-20 08:05:58 +00:00