Gregory Roussac
f58526c701
Merge pull request #905 from PhpMadman/RMARef
...
[-] BO : Order-follow displayed order id instead of order reference
2013-10-29 07:44:26 -07:00
gRoussac
a43851469e
[-] CORE : Currency conversion rate can not be 0
2013-10-29 15:39:17 +01:00
Rémi Gaillard
64706075d5
// Fix default language on BO forms
2013-10-29 15:32:31 +01:00
PhpMadman
7c1623c7fa
[-] BO : Order-follow displayed order id instead of order reference
2013-10-29 14:53:50 +01:00
gRoussac
d409614222
[-] FO : CustomerMessage ip_address to string
2013-10-29 11:18:53 +01:00
Rémi Gaillard
2b67d7072c
// type of logger field
2013-10-29 10:18:29 +01:00
gRoussac
0aca1d4a67
[*] BO : AdminProducts find smallest images
2013-10-29 08:47:41 +01:00
gRoussac
79cba4b655
[-] FO : Fix bug #PSCFV-10851, no shop restriction in vouchers display in cart
2013-10-28 19:00:00 +01:00
Gregory Roussac
9a879bc133
Merge pull request #897 from freedayko/development
...
[*] BO : improved unicode characters replacement in URLs
2013-10-28 03:09:16 -07:00
gRoussac
2dbaa5f73b
[-] BO : Fix bug #10689 , could not set image legend in back office
2013-10-27 22:49:25 +01:00
gRoussac
9a3cfece69
//missing line feed after disable_modsec
2013-10-27 16:05:55 +01:00
Aleksander Palyan
ee06d3114d
[*] BO : improved unicode characters replacement in URLs (Russian and Ukrainian characters added)
2013-10-27 15:05:49 +02:00
Fabio Chelly
8f6a5bb3a1
Merge remote-tracking branch 'origin/development' into development
2013-10-25 17:01:51 +02:00
Fabio Chelly
a7d0794c43
[-] BO : Fixed bug PSCFV-9910 using basic queries to prevent locking errors
2013-10-25 17:01:28 +02:00
gRoussac
eb8ea1cba5
[-] CORE : SetEnv in if statement
2013-10-25 15:29:15 +02:00
gRoussac
4e6585a1b8
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-10-25 15:21:55 +02:00
gRoussac
a03efe152c
[-] CORE : SetEnv not available on all config // @todo curl request on dummy .htacces
2013-10-25 15:21:40 +02:00
Jerome Nadaud
6f57093f50
[-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security
2013-10-24 18:36:36 +02:00
Rémi Gaillard
3cd702da42
[-] WS: Fix stockavailables list when stock is shared between shops #PSCFV-10793
2013-10-24 16:30:02 +02:00
Fabio Chelly
010ad76e6f
Merge remote-tracking branch 'origin/development' into development
2013-10-23 10:55:35 +02:00
Fabio Chelly
5fd3ad5adf
[*] FO ProductSale: improves calculation of most selled products when there are a lot of products in shop
2013-10-23 10:55:23 +02:00
gRoussac
feca06417f
// definition on addFeatureValueImport
2013-10-23 01:23:35 +02:00
gRoussac
5d28d38a22
[-] BO : Fix bug #PSCFV-7907 AdminImport, add custom field to features
2013-10-23 01:18:09 +02:00
Gregory Roussac
398548fecf
Merge pull request #864 from samy-r/features-duplication-escaping
...
[-] CORE : pSQL for feature values
2013-10-22 10:20:44 -07:00
gRoussac
d20aea0563
[-] BO : Fix bug #PSCFV-10767, could not retrieve feature value when product IDs not forced
2013-10-22 11:27:45 +02:00
Samy Rabih
5d8c0a0fc2
duplicateFeatures doesn't protect feature values
...
The features values are not protected using pSQL during the features
duplication
2013-10-21 14:08:30 +02:00
Rémi Gaillard
198e75245d
[-] FO: Don't auto detect language if it not associated to the shop #PSCFV-10273
2013-10-21 09:41:00 +02:00
gRoussac
332c8ff49f
[-] CORE : Fix bug #PSCFV-10687 again, #PSCFV-10752 replaceAccentedChars() // sorry for that
2013-10-21 00:28:41 +02:00
gRoussac
8ef1e043af
[*] BO : chmod 664 to config.xml file
2013-10-18 18:36:30 +02:00
Rémi Gaillard
6747d3bbac
[-] BO: Default country should be overriden in the context in multishop
2013-10-18 10:23:06 +02:00
Rémi Gaillard
b8273a13e6
//
2013-10-17 18:30:22 +02:00
Rémi Gaillard
eb14e25e2a
// small fix for some order by on listing
2013-10-17 11:33:05 +02:00
gRoussac
f1ea9ba5b4
[-] BO : Fix bug #PSCFV-10709 rename root category with slashes in it
2013-10-17 10:53:20 +02:00
Rémi Gaillard
e4faa2bb75
[-] Core: Out of stock status should be setted after the first order history
2013-10-17 10:28:14 +02:00
gRoussac
3ba5905042
[-] BO : Could not order by reserved words like 'key'
2013-10-16 16:25:40 +02:00
MustangZhong
ad27dbe8d1
Update Cart.php
...
The field "id_address_delivery" is missing in getWsCartRows.
Since id_address_delivery is required in the web service field definition.
2013-10-16 10:14:14 +08:00
Rémi Gaillard
837ca34e7e
[-] Core: Product::getPriceStatic called with 1 quantity return the specific price for 1 qty if called with id_cart = 0
2013-10-15 10:30:48 +02:00
Gregory Roussac
dec9ef40a8
Merge pull request #841 from indesign47/patch-10
...
[+] BO : AdminImport add entity Alias
2013-10-15 01:03:33 -07:00
Francois Gaillard
fd2dc4ff64
[-] Classes : Modules listing and case insensitive
2013-10-15 09:14:49 +02:00
indesign47
f25a418785
Update Alias.php
2013-10-14 19:20:38 +02:00
Rémi Gaillard
6f4b85430c
// Fix listings and sort
2013-10-14 18:52:48 +02:00
Gregory Roussac
f3755e2d0a
Merge pull request #843 from ldecoker/patch-10
...
[-] BO : AdminMeta - make sure module and controller name are in lowercase
2013-10-14 07:46:56 -07:00
Gregory Roussac
bce6e8f09f
Merge pull request #837 from axometeam/patch-21
...
[-] BO : bad query when filtering on status + sorting by quantity in the AdminProducts getList
2013-10-14 07:45:52 -07:00
gRoussac
cc8ec4fd45
[-] CORE : Fix bug #PSCFV-10687 bad conversion for accentuated Y and W, thanks @mike15
2013-10-14 16:03:50 +02:00
Jerome Nadaud
3282bd19e4
// Small fix
2013-10-14 10:59:20 +02:00
gRoussac
af9182dad5
[-] CORE , follow up https://github.com/kiropowered/PrestaShop/commit/b87e934a66a15d4f68e573f5afa9494505a60e28 and https://github.com/kiropowered/PrestaShop/commit/a10dcab6e74d138a2f3a3f558ec7d66b1e9d9e10
2013-10-14 10:51:17 +02:00
Gregory Roussac
3539eb3697
Merge pull request #842 from kiropowered/patch-1
...
[-] CORE : StockMvt Fix bug if product have attribute
2013-10-14 01:30:30 -07:00
ldecoker
a377ecd571
Update Meta.php
...
Use strtolower from Tools class.
2013-10-14 09:53:50 +02:00
ldecoker
8d7e96176c
SEO - make sure module and controller name are in lowercase
...
For module controller, make sure that the name of the controller and the module are saved in lowercase. Otherwise the route will not be found in getModuleLink.
2013-10-14 09:38:04 +02:00
gRoussac
f9cfde9a05
[-] MO : Trackingfront, could not load employee stats date
2013-10-12 23:24:32 +02:00