Commit Graph

292 Commits

Author SHA1 Message Date
dMetzger
f09026be73 // Changed max_execution_time for big product selection removal #PSCFV-3181
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16870 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-16 13:23:52 +00:00
dMetzger
15f21f853b // Perfs and clean
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16851 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-14 14:18:55 +00:00
dMetzger
848153a05f // Perfs and clean
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16850 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-14 14:10:11 +00:00
dMetzger
d5337f4f44 [-] FO : fixed cache management conflict for packed product #PSCFV-3294
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16801 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-10 14:26:15 +00:00
vAugagneur
b1e130854f //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16727 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-06 14:47:52 +00:00
rGaillard
ca80cbc4b1 // Fix small bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16724 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-06 13:55:43 +00:00
mDeflotte
c72240fb9f [-] FO : #PSCFV-PSCFV-2598 - Fix bug with features not ordering by position
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16709 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-06 09:29:29 +00:00
vAugagneur
747cfd729b [-] BO : fixed bug #PSCFV-3457
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16674 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-03 07:55:45 +00:00
mDeflotte
66dc8389dd [-] BO : #PSCFV-3366 - Not possible to create customizable fields on multishop context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16635 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 08:15:35 +00:00
lLefevre
218236c1ee [-] TR : fix #PSCFV-3403 : check if is an object before loading stock data
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16634 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 07:45:00 +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
7eec6c7294 //fixed multishop CRUD bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16555 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-24 16:45:52 +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
lLefevre
d6df4781c5 [-] BO : Product : add missing properties
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16536 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-24 07:57:42 +00:00
dMetzger
da117efe58 [*] BO : you can now disable automatic indexation of the products #PSCFV-3258
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16528 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-23 10:55:35 +00:00
rGaillard
c17d577131 // Fix PHP notice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16491 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-19 12:35:51 +00:00
vChabot
b269ebe1a9 [-] BO : BugFix : #PSCFV-2205 : Combination attributes are displayed as many time as they are associated to a shop.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16476 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-18 15:35:51 +00:00
mDeflotte
d94785b76a // Fix bug with Product::priceCalculation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16463 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-18 08:40:09 +00:00
mDeflotte
d5dfb4cfdb [-] BO : #PSCFV-3192 - Product::getAttributeGroups return duplicated attributes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16431 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-16 08:22:09 +00:00
rGaillard
f691d01bce // Fix combinations on product page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16423 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-13 16:27:28 +00:00
rGaillard
17285402c3 [-] Core: Fix PSCFV-3161 stockage of reduction was bad in database
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16421 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-13 15:20:53 +00:00
lLefevre
75a19e7e26 [-] BO : fix #PSCFV-3198
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16418 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-13 14:45:36 +00:00
rGaillard
f7ffb002df [-] Core: Fix PSCFV-3138 sometime product price setted to 0 on combinations with specific prices
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16412 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-13 13:07:58 +00:00
mDeflotte
cab8b2b251 [-] BO : #PSCFV-3192 - Product::getAttributeGroups return duplicated attributes
// Fix little bug

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16411 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-13 12:35:52 +00:00
rGaillard
f39226c85e // Fix some bug on advanced stock management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16353 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-11 15:46:39 +00:00
dMetzger
649cb9af43 // Changed the name of a multishop variable to multishop_specific, in order to avoid confusion
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16293 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 15:48:22 +00:00
rGaillard
8343cb58d5 [-] BO: Fix combinations creation on multistore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16292 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 15:41:07 +00:00
vChabot
f0d03142f3 [-] BO : BugFix : #PSCFV-2823 : Product::priceCalculation() returns null specific_price after two calls
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16131 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-26 08:51:10 +00:00
rGaillard
3caca74140 [-] BO: Fix bugs with stock management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16121 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-25 14:46:03 +00:00
rGaillard
7f38dfdb1f // Optimizations and clean ajax.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16087 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-19 16:47:04 +00:00
rGaillard
369a94466a [-] BO: Update product specific price rules on update
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16077 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-19 09:59:14 +00:00
aFolletete
d7d2e08050 // clean useless INNER JOIN
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16021 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-14 13:30:56 +00:00
vAugagneur
6f375155d2 [-] BO : fixed bug #PSCFV-2828 - Changing the default attribute : no refresh
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16015 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-14 09:03:44 +00:00
mDeflotte
04c342a1b9 [-] BO : #PSCFV-2638 - Fix bug combination mess up in product/quantities
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15967 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-11 13:41:09 +00:00
vChabot
e5db07ad8c [-] BO : BugFix : #PSCFV-2630 : Combination and multishop association issue with shared stock through group shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15928 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-07 14:20:53 +00:00
rMalie
88f537c23d // Fix Product::sqlStock() (use restrictions in left join instead of restrictions in where)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15868 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 09:16:03 +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
rMalie
d9e8899473 // Fix out of stock on combinations with no quantity (thank you Brice <3)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15766 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-30 13:48:23 +00:00
rGaillard
74f5b513af // Performance optimizations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15719 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-29 08:32:13 +00:00
lLefevre
3697b4816a // Fix wholesaleprice when you import a combinaison CSV file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15643 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 14:27:43 +00:00
tDidierjean
947f98c44e // fix warning with specific price
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15623 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 13:33:45 +00:00
mDeflotte
b621e0f9eb [-] BO : #PSCFV-2473 - Fix bug with attribute value and shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15531 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 15:32:56 +00:00
rGaillard
19c239b0b7 // Fix SQL error in the product listing on multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15514 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 14:30:28 +00:00
rGaillard
ff9720fc6d // Fix product bug when no quantity was added for new products attributes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15506 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 14:00:17 +00:00
rGaillard
1bd51177f8 [-] Core: Fix PSCFV-2109 specific prices when updating product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15451 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 14:55:28 +00:00
aFolletete
2dc77533d7 [-] BO : fixed bug #PSCFV-2428 - fix bug on combination creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15412 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 09:34:53 +00:00
fBrignoli
2b228c0c14 [-] MO : Bug fixed #PSCFV-2311 - blockspecials doesn't display discounted products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15357 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-16 16:52:03 +00:00
fBrignoli
0bcc55a096 [-] BO : Bug fixed #PSCFV-1975 - Combination import + multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15268 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 12:55:07 +00:00
fSerny
73fcd280f5 [-] PROJECT : Deleting duplicate hook - #PSCFV-163
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15231 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 14:34:57 +00:00