Commit Graph

2154 Commits

Author SHA1 Message Date
vChabot 241ddaf652 [-] BO : BugFix : #PSFV-462 : category tree view displayed according to he shop context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13168 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-09 09:49:42 +00:00
rMalie bf6b6cd5ca // Fix Tools::toCamelCase()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13156 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-09 09:13:11 +00:00
rMalie 1cd38d2621 // Fix SpecificPrice::update() #PSFV-473
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13155 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-09 08:57:52 +00:00
tDidierjean 64b14de8d2 // Fix AdminController translations not being parsed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13151 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 17:58:35 +00:00
tDidierjean 15b4c98b3a // Fix some helper translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13149 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 17:38:14 +00:00
aKorczak bb170150c5 [-] WS : Fix bug on translated_configurations entity
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13146 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 17:24:05 +00:00
lLefevre 78f345fe98 // Update list of emails files which are native
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13145 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 17:20:26 +00:00
aKorczak c891bbc049 [*] WS : Add entity specific_prices
[*] WS : Add entity specific_price_rules


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13143 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 16:46:57 +00:00
aKorczak de544a8be4 [-] 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


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13138 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 15:42:53 +00:00
fBrignoli f4d3ca50f1 // norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13137 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 15:34:20 +00:00
rGaillard d16b4bcf1e // Debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13135 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 14:55:47 +00:00
rGaillard 4a4a4a79e5 // Clean code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13133 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 14:38:52 +00:00
rMalie 0d20a7a1db // Fix langMultiShop in ObjectModel
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13132 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 14:33:52 +00:00
rGaillard 8a5f37be1b // Fix operator priority bug on class Shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13130 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 14:26:14 +00:00
rMalie f60b412373 // Improve definition in WS
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13126 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 14:04:20 +00:00
rGaillard 91c932f9f9 // Improve BackOffice Order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13122 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 13:34:53 +00:00
rGaillard 0ae248a2bc // Improve/debug SpecificPriceRule
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13121 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 13:23:04 +00:00
aKorczak 7ffaa9be49 [*] WS : Add Tax rules entity
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13100 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 09:05:28 +00:00
aKorczak b973003e04 [*] WS : Fix, Webservice use definitions property instead of fieldsValidate, fieldsRequired, etc..
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13094 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 17:29:04 +00:00
aKorczak 749b2d2f57 [*] WS : Fix, Webservice use definitions property instead of fieldsValidate, fieldsRequired, etc..
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13091 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 17:26:39 +00:00
mDeflotte 8dc8455e78 // fix bug with missing $context->cart and $context->customer durring payment process
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13089 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 17:15:44 +00:00
bMancone 124eb9c676 // Improved Supply Order Form (PDF)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13088 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 17:02:34 +00:00
aFolletete 11a74c652a // clean code && fix norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13081 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 15:31:59 +00:00
mDeflotte 29002976ed // Fix bug with new logo working
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13080 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 15:30:23 +00:00
bMancone 3f6b317c1b // Fixed getLogo()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13079 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 15:22:52 +00:00
bMancone 07186ff3b9 // Fixed Supply Orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13073 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 14:59:56 +00:00
rMalie 610a454a1d // Fix modules front controller in dispatcher #PSFV-449
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13066 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 10:52:01 +00:00
mDeflotte 1785529ea6 [-] BO : #PSTEST-667 - Fix bug with favicon and stores icon and multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13062 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 10:10:40 +00:00
vChabot de4928b0fd // URL UTF8 improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13060 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 09:58:32 +00:00
mDeflotte 071edbda7a [-] BO : #PSTEST-667 - Fix bug with logo and multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13055 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 09:20:01 +00:00
vChabot 9a2e5a3053 // fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13054 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 08:50:07 +00:00
tDidierjean 0a931b8bfe // Move all helper override templates for controllers to subfolders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13052 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 18:12:15 +00:00
dMetzger e22f837ebc [-] BO : cart rule with attributes filter and reduction on the selection of products fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13047 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 17:00:47 +00:00
tDidierjean 6648b4da8d // Rename template/helper to template/helpers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13041 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 16:35:49 +00:00
dMetzger 48e590a257 // Fixed small bug which occured when you refreshed a reduction on a selection of product on an order that did not match the selection anymore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13039 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 16:29:47 +00:00
dMetzger 33df5d5ea7 [*] BO : reduction on a selection of products finalized
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13038 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 16:26:49 +00:00
vChabot 6a9499b72c // url utf8 improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13034 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 15:39:02 +00:00
dMetzger 744bf28826 [*] BO : shop restriction added to the cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13032 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 14:57:39 +00:00
mMarinetti c1bda4b3be // norm in Upgrader.php + reported 1.4 updates in 1.5 branch
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13031 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 14:20:51 +00:00
mDeflotte b36947f364 [-] BO : #PSTEST-661 - Fix bug with non-assigned context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13029 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 14:19:39 +00:00
bMancone d51002f6fe // Improved Supply Order States
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13027 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 14:11:29 +00:00
tDidierjean e3c9f3f8ea // Remove unused dynamic method call in AdminController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13020 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 13:25:34 +00:00
bMancone cdbb18038c // Fixed #PSTEST-643
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13017 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 10:49:55 +00:00
mDeflotte 56ba4a183b [-] BO : #PSTEST-659 - On creating group, table is not prefixed because of a bad parameter to the method DB::insert
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13011 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 09:51:45 +00:00
vChabot 9ef6be204a // Part of Code Review multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13008 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 09:28:35 +00:00
dMetzger 9fa90c4183 [-] BO : wrong error message was displayed on cart rules deletion PSTEST-644
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12998 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-03 16:17:02 +00:00
vChabot ce35fc7311 // Code Review Invoices V&V
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12993 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-03 15:55:53 +00:00
fSerny 23a3f50adb // Small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12988 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-03 15:31:17 +00:00
mMarinetti 402874d24b // fix retrocompatibility in Tab.php related to _GET tab/controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12973 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-03 13:49:01 +00:00
rMalie 3ca7fb1ee2 // Fix translations in AdminControllers from modules #PSFV-397
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12972 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-03 13:31:51 +00:00