Commit Graph

2022 Commits

Author SHA1 Message Date
rMalie 91cb6c2fae // Fix specificPrice with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14924 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 16:00:36 +00:00
rMalie f38483a4e0 // Norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14912 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 14:13:59 +00:00
dMetzger c3585da2a3 [-] FO : free products emptied when there isn't any other products in the cart #PSCFV-300
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14911 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 13:56:22 +00:00
aFolletete fe5cfcf2f8 [-] Classes : fixed bug #PSCFI-5435 - Webservice: cannot set negative combination quantity
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14906 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 12:35:20 +00:00
rMalie c90474318a // Fix bug on _DB_PREFIX_ call in class Shop #PSCFV-1243
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14897 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 09:28:31 +00:00
rMalie e01a890c01 // Use protected instead of private for classes we can override #PSCFV-1976
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14895 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 08:55:55 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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 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
bMancone 66acfbe74c // Fixed WebserviceRequest - Compatibility with PS 1.5.x Shops & GroupShops
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14779 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-19 16:43:00 +00:00
bMancone 58fb6c703a // Fixed WebserviceRequest::saveEntityFromXml() - Compatibility with PS 1.5.x
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14778 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-19 16:23:19 +00:00
tDidierjean 8bb5cd701f // Fix errors on product combinations edition page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14776 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-19 15:41:52 +00:00
rMalie c6ac41fd05 // Fix combination edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14773 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-19 14:50:14 +00:00
aNiassy e48476bee2 [-] FO : #PSCFI-5343 : Fixed a problem of E-mail subject encoding
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14771 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-19 13:43:54 +00:00
tDidierjean a32a003b5c [-] Classes : fix bug #PSTEST-1191 - wrong carrier positions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14768 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-19 13:35:37 +00:00
mDeflotte 59c24a14cb [-] Project : #PSFV-816 - Allow to attach multiple files to an email with the function Mail::send
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14765 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-19 13:00:41 +00:00
tDidierjean c0a6bfaf9c [-] BO : fix #PSTEST-1176 - Modules positions drag and drop - ajax process is broken, page JS too
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14764 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-19 12:20:47 +00:00
mDeflotte 1cb4c8a6bb [-] FO : #PSFV-815 - Moving an SQL request on the controller to the model
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14762 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-19 09:55:13 +00:00
rMalie 264885203d // Remove Shop::getTotalShopWhoExists (rofl ...)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14761 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-19 09:42:26 +00:00
mDeflotte 19961a5438 [-] Project : #PSFV-820 - Cartrules are now reapplied each time we add/remove a product on/from the cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14760 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-19 09:39:14 +00:00
tDidierjean dac784f83e [-] BO : fix #PSTEST-1175 - duplicate text in toolbar in AdminAttributesGroups
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14755 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-19 08:40:13 +00:00
tDidierjean ce95918ff0 [-] BO : fix #PSTEST-1184 - bug with product combinations generator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14753 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-19 08:22:30 +00:00
bMancone a0a103e961 // WS: Fixed shopExists() for 1.5.x compatibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14747 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-18 17:45:04 +00:00
bMancone f912ae8496 // Fixed writePostedImageOnDisk()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14744 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-18 16:14:55 +00:00
tDidierjean 41d8630e97 [*] BO : #PSFV-865 - it is now possible to use drag and drop positions in custom controllers using HelperList
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14740 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-18 15:48:38 +00:00
lLefevre b33b8642b6 // Fix error path image tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14736 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-18 15:11:32 +00:00
rMalie bb17c175d6 // Optimize Hook::exec()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14730 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-18 13:15:39 +00:00