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

6591 Commits

Author SHA1 Message Date
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
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 b87e934a66 and a10dcab6e7 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
kiropowered
a10dcab6e7 Update StockMvt.php 
Fix bug if product have attribute
 2013-10-12 14:28:27 +02:00
indesign47
0a441b9a4b Update Alias.php 2013-10-12 11:49:27 +02:00
Chris
3f6139be42 BO: added UPC and EAN search 2013-10-11 21:02:01 +03:00
Axome
9d5a9225e5 Correct some "bad query" in the admin products getList 
Here the wrong Sql generated :

SELECT SQL_CALC_FOUND_ROWS a.`id_product`,b.name as name,`reference`,a.price as price,a.active as active , MAX(i.id_image) id_image,cl.name `name_category` , a.`price`, 0 AS price_final, sav.`quantity` as sav_quantity, a.`active` FROM `ps_product` a LEFT JOIN `ps_product_lang` b ON (b.`id_product` = a.`id_product` AND b.`id_lang` = 2 AND b.`id_shop` = 1) LEFT JOIN `ps_image` i ON (i.`id_product` = a.`id_product` AND i.cover=1)LEFT JOIN `ps_category_lang` cl ON (a.`id_category_default` = cl.`id_category` AND b.`id_lang` = cl.`id_lang` AND cl.id_shop = 1) LEFT JOIN `ps_stock_available` sav ON (sav.`id_product` = a.`id_product` AND sav.`id_product_attribute` = 0 AND sav.id_shop = 1 ) WHERE 1 AND a.`active` = 0 GROUP BY a.id_product ORDER BY quantity desc LIMIT 0,50 

'quantity' is ambigus (for the ORDER BY)
 2013-10-11 18:17:55 +02:00
Rémi Gaillard
06c62c1684 [-] WS: Fix #PSCFV-10672 order by ID for non multishop entities 2013-10-11 17:53:15 +02:00
gRoussac
a07733fcec [-] BO : Could not insert referrer id_connections_source can not be null 2013-10-11 16:52:53 +02:00
Jerome Nadaud
1a1f3de775 [-] BO: Fixbug #PSCFV-10671 - Double htmlentities. 2013-10-11 13:33:31 +02:00
Gregory Roussac
6c739ee2b3 Merge pull request #833 from djfm/development 
[*] LO : set correct currency format for CHF
 2013-10-11 01:58:10 -07:00
gRoussac
36ca7bc508 [-] BO : AdminImport, fix Group searchByName 2013-10-11 10:23:17 +02:00
djfm
bb96c8754f [*] LO : set correct currency format for CHF 2013-10-11 07:14:30 +00:00