dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,144 Commits 9 Branches 19 Tags
2eaea9cb802c748ae772467b00a9f2db5679a143
Commit Graph

266 Commits

Author SHA1 Message Date
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
rGaillard
7df7f7aac4 [+] BO: The customizable products are now usable in the BackOffice order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15109 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 14:04:13 +00:00
vAugagneur
b0090db2c8 [-] BO : fixed bug #PSCFV-2256 - Error when duplicate a product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15105 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 13:40:54 +00:00
tDidierjean
dbb931aea8 [-] BO : fix bug #PSCFV-2237 - Broken SQL Request in Product->getAccessories() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15101 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 13:15:37 +00:00
mDeflotte
f14a164e75 // Fix bug with product price was badly set to 0 if a specific price rule with 0 as price is applyed to the product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14972 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-30 08:41:53 +00:00
vChabot
ba62ff6581 [-] BO : BugFix #PSCFV-2110 #PSCFV-2117 Category association in product page (back-office) is now saved when you have only one shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14952 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-27 13:54:49 +00:00
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
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
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
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
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
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
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
rMalie
360407f52b // Fix Product::priceCalculation() for multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14705 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-18 07:47:02 +00:00
tDidierjean
03afca360c [-] BO : fix #PSTEST-1170 - broken suppliers edition in product page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14696 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 16:00:31 +00:00
bMancone
7d533b3189 // Fixed exceptions when saving products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14693 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 15:56:04 +00:00
rMalie
e7b7ab9371 // Fix ObjectModel::updateMultishopTable() for Combination 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14690 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 15:29:07 +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
rGaillard
b1f2433205 [*] BO: It is now possible to apply a specific price of 0 euros 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14612 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-12 14:51:23 +00:00
lLefevre
13f16490a7 [*] BO : #PSFV-696 : add attachment when we duplicate a product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14560 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-10 16:23:37 +00:00
lLefevre
4cceed4f4a [-] BO : #PSFV-812 : Fix bug price in a specials block 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14545 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-10 08:16:18 +00:00
lLefevre
3d57070dcb [-] BO : #PSTEST-1129 : fix bug : Error when duplicate a product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14450 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-04 12:32:06 +00:00
rMalie
551f89c0ec // Fix Product->deleteAttributeCombinaison 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14449 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-04 11:24:02 +00:00
tDidierjean
8b46657cae // More BO product page cleanup 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14436 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-03 16:54:00 +00:00
tDidierjean
98cd41799f [-] BO : fix #PSTEST-1123 - Changing default product attribute is broken 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14419 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-03 08:38:41 +00:00