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

3470 Commits

Author SHA1 Message Date
Rémi Gaillard
0e45c649d9 [-] FO: Tools::getMediaServer() should return Tools::getShopDomain() instead of Tools::getHttpHost() #PSCFV-9217 2013-05-22 10:42:35 +02:00
Rémi Gaillard
fe5a54cfcc [-] Core: Fix StockManager::getProductRealQuantities() per warehouse with some orderstatuses #PSCFV-9219 2013-05-22 10:30:57 +02:00
Rémi Gaillard
5312290774 [-] BO: Fix PHP warning on orderslip generation without ecotax #PSCFV-8743 2013-05-21 15:25:58 +02:00
vAugagneur
dc5df43d16 //remove useless comments 2013-05-21 11:28:24 +02:00
Vincent Augagneur
6d6b2ef7d3 Merge pull request #225 from emily-d/development 
[-] FO : PS_SSL_ENABLED and mod_rewrite yields a 301 error (Too Many Red...
 2013-05-21 02:27:30 -07:00
vAugagneur
0d4fd0729b //small bug 2013-05-21 10:30:35 +02:00
vAugagneur
3328c7a653 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
vAugagneur
ec87deb016 [-] BO : remove deprecated parameter when call Tools::link_rewrite() part 2 2013-05-20 16:39:08 +02:00
vAugagneur
7aef793e65 [-] BO : remove deprecated parameter when call Tools::link_rewrite() 2013-05-20 16:33:12 +02:00
Vincent Augagneur
e157a8f0d4 Merge pull request #438 from PrestaEdit/patch-36 
[-] Class: Tools / link_rewrite(displayParameterAsDeprecated)
 2013-05-20 06:23:20 -07:00
Vincent Augagneur
3bd489df15 Merge pull request #437 from PrestaEdit/patch-35 
[-] Class: Tools / displayDate (displayParameterAsDeprecated)
 2013-05-20 06:22:59 -07:00
PrestaEdit
62f350334c // Set param as null 2013-05-20 14:56:12 +02:00
PrestaEdit
c573819dc9 // Set params as null 2013-05-20 14:49:45 +02:00
raulgundin
e7393dc5d0 [-] CORE: Fix #PSCFV-9185 Wrong product price display on list by manufacturer 
Added default_on condition on getProducts() query in Manufacturer class.
 2013-05-18 14:38:07 +03:00
gRoussac
110064a0c1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-17 18:09:32 +02:00
gRoussac
e2cfa9f08e [-] BO : Fix #PSCFI-7186 incorrect return in Meta->deleteSelection() 2013-05-17 17:56:42 +02:00
Rémi Gaillard
8b95e9f2ca [-] BO: Root category should be the shop category and not the higher category with multiple root and without multishop #PSCFV-8860 2013-05-17 17:10:11 +02:00
PrestaEdit
4253754afd [-] Class: Tools / link_rewrite(displayParameterAsDeprecated) 2013-05-17 00:52:39 +02:00
PrestaEdit
2e9efe58cc [-] Class: Tools / displayDate (displayParameterAsDeprecated) 2013-05-17 00:40:22 +02:00
gRoussac
e7f54d3694 [-] CORE : TRACKING_DIRECT_TRAFFIC not respected 2013-05-16 11:24:44 +02:00
gRoussac
2cd6724591 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-16 11:05:28 +02:00
gRoussac
0753dab214 [-] CORE : referer keywords truncated before insertion in connections table 2013-05-16 11:05:19 +02:00
Damien Metzger
21d45b61bd [-] BO : fixed gift deletion when there is no products anymore in the cart 2013-05-16 11:03:21 +02:00
gRoussac
da15136c67 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-15 17:12:55 +02:00
gRoussac
e34ef4f7f4 // no controllerUri for front office please 2013-05-15 17:11:32 +02:00
Rémi Gaillard
ee8da0499b // also set query_string and server_name 2013-05-15 16:46:48 +02:00
Rémi Gaillard
a0423d6226 // small fix 2013-05-15 16:26:02 +02:00
Rémi Gaillard
a22138f3c7 // small fix for id_shop and php-cli 2013-05-15 16:23:29 +02:00
Rémi Gaillard
8d0e28291b [-] BO: Fix listing exports with image or other empty fields 2013-05-15 15:49:42 +02:00
Damien Metzger
45b1c864a5 [-] BO : catch prestashop exception and display smart error messages #PSCFV-9147 2013-05-15 15:39:58 +02:00
gRoussac
d9e93a6352 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-15 14:51:16 +02:00
Rémi Gaillard
2c10ba5359 [*] Core: you can now pass a query string with php-cli which will merged with for cronjobs and other things 2013-05-15 14:46:40 +02:00
gRoussac
792d477a9d [-] CORE : Fix bug #PSCFI-7072 redundant configuration get 2013-05-15 14:44:33 +02:00
Damien Metzger
35463be99a // Fixed product rules issue in the cart rules with mod_mysql 2013-05-15 14:14:46 +02:00
gRoussac
79c1d7d0f0 // refacto for last commit c7aa92f3b3 2013-05-15 11:47:46 +02:00
gRoussac
9b615244b1 [-] BO : Fix "The controller adminnotound is missing or invalid." error when no controller get variable 2013-05-15 11:31:55 +02:00
Rémi Gaillard
dff200ac9d [-] Core: Fix StockManager::getProductRealQuantities() for refunded quantities on non delivered orders 2013-05-14 09:53:33 +02:00
Samy Rabih
7b26967df0 $id_shop_list filtering in addAttribute 
When addAttribute is used with a not-empty $id_shop_list array argument,
the shop IDs are not filtered to be unique, so $combination->add()
fails.
 2013-05-13 14:50:24 +02:00
Damien Metzger
693b3355a8 [-] BO : fixed turkish characters replacement #PSCFV-8968 2013-05-07 14:09:28 +02:00
Damien Metzger
4df5ac447f [-] BO : tab cache wasn't emptied on delete #PSCFV-9053 2013-05-06 09:23:07 +02:00
Rémi Gaillard
7eb318b0b0 // small fix 2013-05-02 18:58:05 +02:00
Rémi Gaillard
41786587ba [-] BO: Fix #PSCFV-8179 shop domain used in emails sometimes was for the wrong shop 2013-05-02 18:42:01 +02:00
Rémi Gaillard
fb3291a08f // id_product_attribute is not necessary in the cache name of Product::getPriceStatic for cart_quantity 2013-04-30 12:33:52 +02:00
Gregory Roussac
2051b925a1 //norms 2013-04-29 21:55:30 +02:00
Gregory Roussac
93d5016848 [-] Bo : Admin login loop under Firefox 2013-04-29 21:54:26 +02:00
Rémi Gaillard
8996690a65 [-] Core: Fix specific prices if they are configured to count quantity per product and not per combination 2013-04-29 18:49:42 +02:00
Dragan Skrbic
7f8a33763a // Fixed image import 2013-04-29 18:07:42 +02:00
Damien Metzger
3600a31862 [-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181 2013-04-29 17:45:45 +02:00
vAugagneur
7b1c50b97f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-29 16:21:51 +02:00
vAugagneur
f58c8e7a93 Merged Pull Request #242 - thanks @andskiba 2013-04-29 16:21:33 +02:00