Commit Graph

150 Commits

Author SHA1 Message Date
rGaillard dc98b821b5 // small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17571 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-26 14:21:44 +00:00
rGaillard 3fae760e85 // Fix #PSCFV-4384
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17557 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-26 12:25:59 +00:00
rGaillard f2985f1368 // Fix PSCFV-4384
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17556 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-26 12:23:14 +00:00
rGaillard 77bea290f1 // Small fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17398 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-17 16:24:26 +00:00
rGaillard 4c6276f1cd // Some files was missing in last commit............................................
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17375 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-14 14:28:04 +00:00
vAugagneur 464ab13391 [-] CORE : fixed bug #PSCFV-4002 - Error in webservices with /api/categories/1
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17371 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-14 08:28:14 +00:00
rGaillard ad7b4f5bf9 // Fix #PSCFV-4052
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17349 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-13 15:23:15 +00:00
dMetzger c23a05f132 [-] BO : children categories were not really deleted #PSCFV-4028
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17304 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-12 13:30:40 +00:00
rGaillard aea7340012 // Fix bugs with category positions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17293 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-11 16:33:21 +00:00
vAugagneur 4f5785f307 [-] CORE : fixed bug #PSCFV-3889
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17290 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-11 15:14:51 +00:00
rGaillard 196bea5553 // small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17108 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-30 16:44:28 +00:00
rGaillard 9ced871cb5 [-] Core: add default values in stock available on combination creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17105 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-30 15:55:26 +00:00
dMetzger 7a0821fc10 [-] FO : fixed mixed cache in different shops #PSCFV-3174
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17033 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-27 16:48:39 +00:00
dMetzger 40301f8d6b // Fixed error on category tree with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17013 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-27 10:06:14 +00:00
dMetzger 6cdc8aa6da [*] BO : Changed the default list view for products and categories when multistore is activated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16972 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-23 14:36:52 +00:00
dMetzger 25cd7f07f8 // Fixed missing association between shop and categories #PSCFV-3685
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16912 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-20 14:57:22 +00:00
dMetzger de4ad1d4b7 // GROUP BY is not a function that magically remove doubles!
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16846 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-14 13:30:03 +00:00
vChabot 9939577f01 [-] BO : BugFix : #PSCFV-3554 : Class Category, Method calcLevelDepth: throw Exception
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16774 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-09 12:52:19 +00:00
vAugagneur c4c69c3aee //fixed create root category
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16666 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-02 14:53:47 +00:00
lLefevre a920359f1d // Performance when use getLinkRewrite() for categories
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16637 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 09:15:53 +00:00
vChabot f07f7712af // fixing sql error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16585 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 13:56:20 +00:00
vChabot 7fca32e3dc [-] BO : BugFix : #PSCFV-3334 : Price Rules : Catalog Price Rules - In condition group when you want to make a condition with categories, in the list appears every categories from every stores
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16584 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 13:52:05 +00:00
vAugagneur 13b93ddaef [-] BO : fixed bug #PSCFV-3338
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16583 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 13:46:19 +00:00
vAugagneur db081565c3 [-] BO : fixed bug #PSCFV-3352
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16582 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 13:03:54 +00:00
vAugagneur 26624d9f2f [-] BO : fixed bug #PSCFV-3352
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16578 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-26 09:20:37 +00:00
vAugagneur 9e54583319 [-] BO : fixed bug #PSCFV-3336
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16573 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-25 15:44:09 +00:00
dMetzger 096bc90802 [-] BO : cart rules are now cleaned when a component of a product rule (like a product, a category, a supplier...) is deleted
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16548 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-24 13:11:56 +00:00
vAugagneur 97df2a2095 [-] CLASSES : fixed bug #PSCFV-2836 - Warning on Category::recurseLiteCategTree()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16030 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-15 07:14:58 +00:00
rMalie f6059f0a67 // Webservice getters are now multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15785 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-01 07:45:41 +00:00
mDeflotte 1912c4b543 [-] BO : #PSCFV-2562 - Select all categories on creating a new shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15673 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 16:44:00 +00:00
rMalie 962a641bd9 // Fix multishop on Category->getChildrenWithNbSelectedSubCat() (best name ever)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15543 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 16:51:09 +00:00
tDidierjean 26c1e8ded3 // fix product list by category when ordering by update date
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15430 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 12:14:45 +00:00
vChabot 92a56d34df [-] BO : BugFix : Creating a category in multishop updates her position as well
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15417 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:16:24 +00:00
vChabot 42b3e483b7 // little fix sql categories and product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15307 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-15 09:46:04 +00:00
mDeflotte a4ed3d0092 [-] FO : #PSCFV-1792 - Fix bug with attribute check_access of the method Category::getProducts()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15218 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 12:10:22 +00:00
vChabot be7522cbbc [-] BO : BugFix : #PSCFV-2300 : Bug on categories position
// When multishop is not enabled in the BO, you can't change the position of your categories
// When multishop is enabled in the BO, you can change the positions of your categories in the BO, but the positions of the categories on the front do not change.

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15209 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 09:33:08 +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
rMalie 04a7580a98 // Fix join between product_attribute and product_attribute_shop on getproducts methods
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14700 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 16:10:51 +00:00
rMalie 0c2dd0cd2f // MERGE product_multistore branch : product fields are now editable per shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 13:32:12 +00:00
fGaillard c26a57e977 [-] MO : #PSFV-620 : Added cast and bug fix for multi shops categories
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14329 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-28 12:43:39 +00:00
vChabot 427d139207 // category import improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14298 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-27 13:41:34 +00:00
vChabot 695cff5a56 // little fix when add category
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14196 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-15 13:54:35 +00:00
vChabot d50bf1537e // little fix about adding a category (associated groups)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14188 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-15 10:09:01 +00:00
rMalie 409f0f24d1 // Little refacto
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14170 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-14 16:40:25 +00:00
vChabot ba91c597c7 [-] BO : BugFix : #PSFV-664 : Category import handles multishop now
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14167 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-14 16:21:03 +00:00
tDidierjean 921b688fea // FO Optimization : remove useless Category instantiations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14155 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-14 14:17:46 +00:00
vChabot 8a42a9a74a // category treeview in "all" context shop fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13728 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-29 10:15:23 +00:00
vChabot cb87b22f4f [-] BO : BugFix : #PSTEST-788 : Treeview is now handled with shop context in admin category controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13707 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-28 17:16:47 +00:00
vChabot c866259793 [-] BO : BugFix : #PSFV-585 : New Customer Groups can't see the root categories
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13689 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-28 14:27:08 +00:00
dMetzger f6b91055d5 [+] BO : added a new option for the products : do they appear in the catalog, in the search, both or neither
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13638 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 15:55:40 +00:00