Commit Graph

1972 Commits

Author SHA1 Message Date
rMalie ba4c5dbb18 // Some optimization #PI-121
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14723 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-18 09:57:19 +00:00
lLefevre 2ae5cf56ab // Fix small bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14722 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-18 09:50:48 +00:00
lLefevre 5b912196b0 // Fix file_exists errors on the retrocompatibility image tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14716 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-18 09:26:31 +00:00
rMalie eeeb925420 // Shop::$asso_table is now public (for modules) #PSFV-551
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14712 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-18 08:38:30 +00:00
rMalie 94a7037013 // Add DESC keyword to executeS() filter #PSFV-791
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14706 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-18 07:52:40 +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
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
jBreux 72eb7b253e // Fix page link (for W3C)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14698 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 16:05:52 +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 14c20002e4 // Fix ObjectModel::updateMultishopTable() for Combination
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14691 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 15:45:47 +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
tDidierjean a71704fb4e [-] BO : fix #PSTEST-1169 broken processing of list filters
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14688 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 15:08:36 +00:00
rMalie dacf032092 // Fix ObjectModel with multishop flag to false
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14685 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 14:56:53 +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
jBreux d126db086f // Fix page link (for W3C)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14680 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 12:54:02 +00:00
bMancone d9e01b3375 // WS : Warehouses - #PI-127
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14673 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 09:21:04 +00:00
rMalie 099c6a7080 // Fix id_shop in URL for BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14670 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 08:26:31 +00:00
tDidierjean ca71733f00 [*] BO : #PSTEST-1157 - Ajax deletion of virtual file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14668 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 08:07:35 +00:00
bMancone 285becae29 // Fixed stock_available when ordering products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14656 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 13:39:15 +00:00
lLefevre 5c6e33b72a [*] BO : #PSFV-832 : change the type of the property "ajax"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14655 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 13:24:28 +00:00
rGaillard 3c2f9de5ba // small fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14651 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 09:47:34 +00:00
rMalie 41f137e82b // Fix id_shop in URL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14650 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 09:45:19 +00:00
rMalie 3971ab65fa // Fix id_shop in URL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14644 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 09:07:24 +00:00
mDeflotte 813415a344 // Add missing parameter
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14634 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 14:25:00 +00:00
lLefevre 2b807940ae [-] BO : #PSFV-855 : Fix bug in BlockCMS AND set submit_action to NULL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14633 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 14:15:45 +00:00
mDeflotte 58ef5e6e9b [-] FO : #PSCFI-5322 - Order::hasBeenDelivered and Order::hasBeenPaid don't work for all order states
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14629 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 13:40:29 +00:00
lLefevre a11f0a7828 [-] BO : fix #PSCFI-5408
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14620 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 08:02:06 +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 e6ab36e942 [-] BO : fix #PSFV-852 : url encoded incorrect when in the search there is specials character
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14611 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 14:00:53 +00:00
mDeflotte 9b4aad56a9 [-] BO : #PSFV-797 - Fix bug with order invoice pdf and customized products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14608 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 13:22:47 +00:00
mDeflotte 99beaf6ed0 [-] FO : #PSFV-797 - Fix bug with order detail and customized products
[-] BO : #PSFV-797 - Fix bug with order editing  and customized products

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14607 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 13:02:18 +00:00
tDidierjean a90df49584 // getModulesTranslations optimization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14602 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 12:21:28 +00:00
vAugagneur 9ca9b3b6d0 [-] BO : fixed bug #PSTEST-1144 - carrier image problem
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14599 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 09:47:20 +00:00
dMetzger 21e4d3f45a [-] FO : fixed bug where you couldn't get a free product with a cart rule if you already had the same product in your cart #PSTEST-1063
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14597 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 09:31:53 +00:00
fBrignoli 4087fee9c7 // removed retrocompat
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14596 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 09:28:07 +00:00
tDidierjean 244a2f9102 [*] BO : #PI-123 - toolbar and page title refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14594 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 08:34:38 +00:00
fBrignoli ff98873fb5 // perf
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14591 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-11 16:03:57 +00:00
lLefevre 73175f1191 [-] BO : fix #PSCFI-4878
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14590 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-11 15:42:42 +00:00
fBrignoli 9143529d93 // perf
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14587 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-11 15:40:43 +00:00
fBrignoli 1a981add83 // perf
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14585 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-11 15:36:25 +00:00
fBrignoli 8962e138aa // perf improvements
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14581 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-11 14:33:55 +00:00
lLefevre abc2a436fc // Add meta tag content-language in FO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14578 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-11 14:21:48 +00:00
bMancone c6f23c7710 // Fixed getCurrentCustomerGroups() #PSFV-818
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14574 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-11 14:00:02 +00:00
bMancone e3a5357dc9 // Fixed getCurrentCustomerGroups() #PSFV-843
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14573 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-11 13:59:26 +00:00
mDeflotte e1adbf06de // Bug Fix with address rendering
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14569 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-11 13:12:55 +00:00
tDidierjean 30b8e697c7 // change page time load calculation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14567 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-11 11:53:44 +00:00
fBrignoli 7618906efe // missing call
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14566 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-11 08:45:28 +00:00
fBrignoli b034d8f1f2 [*] FO : Layout & Template override
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14564 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-11 08:24:59 +00:00
dMetzger 448e856c85 // nothing serious :]
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14562 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-10 17:02:33 +00:00